summaryrefslogtreecommitdiffstats
path: root/vagrant/Vagrantfile
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-07-08 14:55:19 +0200
committerTails developers <amnesia@boum.org>2014-07-10 18:19:01 +0200
commit36adf1980560fedd4698e2cfaf83d10e58cdf239 (patch)
tree074f0d4b8ed50404db860618df2a8ee86510453e /vagrant/Vagrantfile
parentbd714b6a2c06ba5942b45e39ecafd123a024c4cb (diff)
Migrate Vagrant basebox to Debian Wheezy (Closes #7133, #6736).
This does a number of things beyond upgrading the basebox distribution to Debian Wheezy: * Drop Rakefile integration since it relies on Veewee's integration in Vagrant, which is broken. Now a workaround is documented. * Install the 3.x "from"-port (squeeze's l-b 2.x re-versioned to 3.x to replace wheezy's real 3.x) of `live-build` from deb.t.b.org. * Bump disk capacity to 15 GB to take into account the larger amount of space needed when building Wheezy images (#7133). This should also future-proof this aspect a bit. * The documented process for buliding new baseboxes, in particular the part that gives each one a new name, not only *works* (as opposed to the old docs, and the Rakefile integration) but should also solve #6736. The different name implies that Vagrant won't use the cached version. Of course, the commit that updates the basebox must be present in a branch for it to use the new basebox. * Various small improvements.
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 0668a68a..c8ba1ae 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'
- config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/squeeze.box'
+ config.vm.box = 'tails-builder-XXXXXXXX'
+ config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/tails-builder-XXXXXXXX.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'
- config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/squeeze.box'
+ config.vm.box = 'tails-builder-XXXXXXXX'
+ config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/tails-builder-XXXXXXXX.box'
config.vm.provision "shell",
inline: "sudo http_proxy='#{ENV['http_proxy']}' /vagrant/provision/setup-tails-builder"