summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2016-12-01 15:39:15 +0100
committerbertagaz <bertagaz@ptitcanardnoir.org>2016-12-01 15:39:15 +0100
commitb4a61666a1ccec0665575f3e0a10c2b0909cf932 (patch)
treec1638dbd68685fb736ca2f0cdb7704c37ffb31d5
parent8b3135b14800a5390bf023bca9f1370e50577dfc (diff)
Remove buggy code.
As /var/cache/apt-cacher-ng is not mounted automatically when an already existing vagrant builder is started,created, this part of the code was triggered without necessity. Better just remove it than trying to work around. Will-fix: #11979
-rwxr-xr-xvagrant/provision/setup-tails-builder13
1 files changed, 1 insertions, 12 deletions
diff --git a/vagrant/provision/setup-tails-builder b/vagrant/provision/setup-tails-builder
index b7a182e..07a17e6 100755
--- a/vagrant/provision/setup-tails-builder
+++ b/vagrant/provision/setup-tails-builder
@@ -55,19 +55,8 @@ if [ ! -b /dev/vdb1 ]; then
mkfs.ext4 /dev/vdb1
fi
-if [ -d /var/cache/apt-cacher-ng/ ]; then
- if ! mountpoint -q /var/cache/apt-cacher-ng; then
- echo "A previous installation has been detected, migrating APT data."
- mount /dev/vdb1 /mnt
- rsync -a /var/cache/apt-cacher-ng/ /mnt/
- rm -rf /var/cache/apt-cacher-ng/*
- umount /mnt/
- echo "Migration done. You may want to recreate your vagrant box to save disk space."
- fi
-
-else
+[ -d /var/cache/apt-cacher-ng/ ] || \
adduser --quiet --system --group --home /var/cache/apt-cacher-ng apt-cacher-ng
-fi
if ! mountpoint -q /var/cache/apt-cacher-ng; then
mount /dev/vdb1 /var/cache/apt-cacher-ng