mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed the issue of xenial64 box being unable to run because vagrant user is absent

This commit is contained in:
Pankaj Garg 2016-07-15 00:33:49 +05:30
parent 8c4802312d
commit 5f713ec1c1
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Vagrantfile vendored
View File

@ -12,12 +12,19 @@ end
def packages_debianoid def packages_debianoid
return <<-EOF return <<-EOF
if id "vagrant" >/dev/null 2>&1; then
username='vagrant'
home_dir=/home/vagrant
else
username='ubuntu'
home_dir=/home/ubuntu
fi
apt-get update apt-get update
# install all the (security and other) updates # install all the (security and other) updates
apt-get dist-upgrade -y apt-get dist-upgrade -y
# for building borgbackup and dependencies: # for building borgbackup and dependencies:
apt-get install -y libssl-dev libacl1-dev liblz4-dev libfuse-dev fuse pkg-config apt-get install -y libssl-dev libacl1-dev liblz4-dev libfuse-dev fuse pkg-config
usermod -a -G fuse vagrant usermod -a -G fuse $username
apt-get install -y fakeroot build-essential git apt-get install -y fakeroot build-essential git
apt-get install -y python3-dev python3-setuptools apt-get install -y python3-dev python3-setuptools
# for building python: # for building python:
@ -27,7 +34,7 @@ def packages_debianoid
# newer versions are not compatible with py 3.2 any more. # newer versions are not compatible with py 3.2 any more.
easy_install3 'pip<8.0' easy_install3 'pip<8.0'
pip3 install 'virtualenv<14.0' pip3 install 'virtualenv<14.0'
touch ~vagrant/.bash_profile ; chown vagrant ~vagrant/.bash_profile touch $home_dir/.bash_profile ; chown $username $home_dir/.bash_profile
EOF EOF
end end
@ -283,7 +290,13 @@ end
def fix_perms def fix_perms
return <<-EOF return <<-EOF
# . ~/.profile # . ~/.profile
if id "vagrant" >/dev/null 2>&1; then
chown -R vagrant /vagrant/borg chown -R vagrant /vagrant/borg
else
chown -R ubuntu /vagrant/borg
fi
EOF EOF
end end
@ -338,6 +351,17 @@ Vagrant.configure(2) do |config|
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("centos6_64") b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("centos6_64")
end end
config.vm.define "xenial64" do |b|
b.vm.box = "ubuntu/xenial64"
b.vm.provider :virtualbox do |v|
v.memory = 768
end
b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("xenial64")
b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("xenial64")
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("xenial64")
end
config.vm.define "trusty64" do |b| config.vm.define "trusty64" do |b|
b.vm.box = "ubuntu/trusty64" b.vm.box = "ubuntu/trusty64"
b.vm.provider :virtualbox do |v| b.vm.provider :virtualbox do |v|