summaryrefslogtreecommitdiffstats
path: root/vagrant/Vagrantfile
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-12-01 14:03:49 +0100
committerTails developers <amnesia@boum.org>2014-12-01 15:12:20 +0100
commitf8afa2e31eba472d3462a6b3de749ba168d5dde5 (patch)
tree6abcb5e0229874c754a7ac18f4614c07e4689211 /vagrant/Vagrantfile
parent6a5b3d322b594274dfae4eeaf57beb8832c078d1 (diff)
Update to vagrant build box tails-builder-20141201 (Closes: 7644).
I untar:ed the old tails-builder-20140709.box, removed the offending lines from box.ovf and s/20140709/20141201/, and re-tar:ed it all.
Diffstat (limited to 'vagrant/Vagrantfile')
-rw-r--r--vagrant/Vagrantfile8
1 files changed, 4 insertions, 4 deletions
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 79365b9..7009c90 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -32,8 +32,8 @@ cpus = ENV['TAILS_BUILD_CPUS']
if vagrant_old
Vagrant::Config.run do |config|
- config.vm.box = 'tails-builder-20140709'
- config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/tails-builder-20140709.box'
+ config.vm.box = 'tails-builder-20141201'
+ config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/tails-builder-20141201.box'
config.vm.provision :shell, :inline => "http_proxy='#{ENV['http_proxy']}' /vagrant/provision/setup-tails-builder"
@@ -44,8 +44,8 @@ if vagrant_old
end
else
Vagrant.configure("2") do |config|
- config.vm.box = 'tails-builder-20140709'
- config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/tails-builder-20140709.box'
+ config.vm.box = 'tails-builder-20141201'
+ config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/tails-builder-20141201.box'
config.vm.provision "shell",
inline: "sudo http_proxy='#{ENV['http_proxy']}' /vagrant/provision/setup-tails-builder"