summaryrefslogtreecommitdiffstats
path: root/vagrant/provision
diff options
context:
space:
mode:
authorDavid Isaac Wolinsky <isaac.wolinsky@gmail.com>2013-12-09 23:13:39 -0500
committerTails developers <amnesia@boum.org>2013-12-21 12:16:25 +0000
commit3d093c8e481a244320a74781ea12e57cedbd9d8c (patch)
treee008f8168e0d58c93d3b07e26964537fb671f1e1 /vagrant/provision
parent4d81fa4d9890fd89ebfed9bbd26873ebbd22c17d (diff)
fixes for vagrant v2 (1.3.5) - Version tested via vagrant_version: vagrant_old - Moved the box checksum as a define since the newer vagrant doesn't pass the env to the downloader - Added the insertion of the Debian keys because it was failing to build otherwise
Diffstat (limited to 'vagrant/provision')
-rwxr-xr-xvagrant/provision/setup-tails-builder6
1 files changed, 6 insertions, 0 deletions
diff --git a/vagrant/provision/setup-tails-builder b/vagrant/provision/setup-tails-builder
index cd84925..8404668 100755
--- a/vagrant/provision/setup-tails-builder
+++ b/vagrant/provision/setup-tails-builder
@@ -30,6 +30,12 @@ sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/ikiwiki <<EOF
Pin-Priority: 500
EOF
+for num in 5 6 7; do
+ wget http://ftp-master.debian.org/keys/archive-key-"$num".0.asc
+ apt-key add archive-key-"$num".0.asc
+ rm archive-key-"$num".0.asc
+done
+
apt-get update
apt-get -y install apt-cacher-ng