summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-12-15 21:08:39 +0000
committerintrigeri <intrigeri@boum.org>2018-12-15 23:52:57 +0000
commitab7c37dead9d75ba32af8b78ae45306258a2a305 (patch)
tree56661143db658f2003ed934ddea5229e45ceb671 /vagrant
parentdc1aebb4433cbb65a04f31646d245255063813b3 (diff)
Use mtools from Buster to generate the USB image (refs: #15985)
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/definitions/tails-builder/postinstall.sh17
1 files changed, 17 insertions, 0 deletions
diff --git a/vagrant/definitions/tails-builder/postinstall.sh b/vagrant/definitions/tails-builder/postinstall.sh
index ba131bd..50e8a07 100755
--- a/vagrant/definitions/tails-builder/postinstall.sh
+++ b/vagrant/definitions/tails-builder/postinstall.sh
@@ -61,6 +61,23 @@ sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/stretch-backports << EOF
Pin-Priority: 100
EOF
+# XXX: remove once the Vagrant build VM has mtools >= 4.0.18-2.1 (Buster)
+echo "I: Adding Debian Buster APT suite..."
+echo " deb http://time-based.snapshots.deb.tails.boum.org/debian/${DEBIAN_SERIAL}/ buster main"\
+ > "/etc/apt/sources.list.d/stretch-updates.list"
+echo "I: Adding APT pinning for Buster..."
+sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/buster << EOF
+ Package: *
+ Pin: release n=buster
+ Pin-Priority: -1
+EOF
+echo "I: Adding APT pinning for mtools..."
+sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/mtools << EOF
+ Package: mtools
+ Pin: release n=buster
+ Pin-Priority: 999
+EOF
+
apt-get update
echo "I: Installing Vagrant dependencies..."