Merge pull request #3757 from ThomasWaldmann/vagrant-fix

vagrant: use "vagrant" as username for new xenial box
This commit is contained in:
TW 2018-04-06 23:38:35 +02:00 committed by GitHub
commit a21e8f6926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

2
Vagrantfile vendored
View File

@ -400,7 +400,7 @@ Vagrant.configure(2) do |config|
v.memory = 1024 + $wmem v.memory = 1024 + $wmem
end end
b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant")
b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("ubuntu") b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant")
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("xenial64") 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(true) b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg(true)
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("xenial64") b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("xenial64")