summaryrefslogtreecommitdiffstats
path: root/vagrant/lib
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/lib
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/lib')
-rw-r--r--vagrant/lib/tails_build_settings.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/vagrant/lib/tails_build_settings.rb b/vagrant/lib/tails_build_settings.rb
index d626790..0859dbf 100644
--- a/vagrant/lib/tails_build_settings.rb
+++ b/vagrant/lib/tails_build_settings.rb
@@ -3,7 +3,7 @@
# vi: set ft=ruby :
# Hostname of the virtual machine (must be in /etc/hosts)
-VIRTUAL_MACHINE_HOSTNAME = 'squeeze.vagrantup.com'
+VIRTUAL_MACHINE_HOSTNAME = 'tails-builder-XXXXXXXX.vagrantup.com'
# Approximate amount of extra space needed for builds
BUILD_SPACE_REQUIREMENT = 6656
@@ -15,4 +15,4 @@ VM_MEMORY_FOR_DISK_BUILDS = 512
VM_MEMORY_FOR_RAM_BUILDS = VM_MEMORY_FOR_DISK_BUILDS + BUILD_SPACE_REQUIREMENT
# Checksum for BOX
-BOX_CHECKSUM = '8951d257fc4751437812477df81d55670ebcc0b57c525c248cf2284a89540ca3'
+BOX_CHECKSUM = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'