summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/definitions/tails-builder/generate-tails-builder-box.sh1
-rwxr-xr-xvagrant/definitions/tails-builder/postinstall.sh9
-rwxr-xr-xvagrant/provision/assets/build-tails2
3 files changed, 11 insertions, 1 deletions
diff --git a/vagrant/definitions/tails-builder/generate-tails-builder-box.sh b/vagrant/definitions/tails-builder/generate-tails-builder-box.sh
index 33eff1a..40f8f6f 100755
--- a/vagrant/definitions/tails-builder/generate-tails-builder-box.sh
+++ b/vagrant/definitions/tails-builder/generate-tails-builder-box.sh
@@ -1,6 +1,7 @@
#!/bin/sh
set -e
set -u
+set -x
# Based on ypcs' scripts found at:
# https://github.com/ypcs/vmdebootstrap-vagrant/
diff --git a/vagrant/definitions/tails-builder/postinstall.sh b/vagrant/definitions/tails-builder/postinstall.sh
index a0ab2e5..76c02f9 100755
--- a/vagrant/definitions/tails-builder/postinstall.sh
+++ b/vagrant/definitions/tails-builder/postinstall.sh
@@ -72,10 +72,13 @@ sed -i 's,^GRUB_TIMEOUT=5,GRUB_TIMEOUT=1,g' /etc/default/grub
echo "I: Installing Tails build dependencies."
apt-get -y install \
debootstrap \
+ dosfstools \
dpkg-dev \
eatmydata \
faketime \
+ gdisk \
gettext \
+ gir1.2-udisks-2.0 \
git \
ikiwiki \
intltool \
@@ -93,12 +96,18 @@ apt-get -y install \
libyaml-syck-perl \
live-build \
lsof \
+ mtools \
+ p7zip-full \
perlmagick \
psmisc \
+ python3-gi \
rsync \
ruby \
+ syslinux \
+ syslinux-common \
syslinux-utils \
time \
+ udisks2 \
whois
# Ensure we can use timedatectl
diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails
index 87fd478..050416e 100755
--- a/vagrant/provision/assets/build-tails
+++ b/vagrant/provision/assets/build-tails
@@ -34,7 +34,7 @@ remove_build_dirs() {
tries=0
sudo lsof | grep --fixed-strings "${mountpoint}" || true
while ! sudo umount -f --verbose "${mountpoint}" && [ $tries -lt 12 ]; do
- sudo fuser --ismountpoint --mount "${mountpoint}" --kill
+ sudo fuser --ismountpoint --mount "${mountpoint}" --kill || true
sleep 5
tries=$(expr $tries + 1)
done