summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2020-01-01 08:22:36 +0000
committerintrigeri <intrigeri@boum.org>2020-01-01 11:58:07 +0000
commitfc48e119a174ff0abcaad3ec238b7a1354d82c14 (patch)
tree25cba5ac83ab9e54a504a47fb43caf3f6759b972 /vagrant
parentbbe483ab85480855305a28c9ecc8f93976ef4136 (diff)
Build system: behave correctly when disabling a previously set "offline" or "vmproxy+extproxy" build option
Previously, setting one of these build options *once* would taint the Vagrant box forever with the resulting apt-cacher-ng configuration.
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/provision/setup-tails-builder1
1 files changed, 1 insertions, 0 deletions
diff --git a/vagrant/provision/setup-tails-builder b/vagrant/provision/setup-tails-builder
index cc80f01..d600d8b 100755
--- a/vagrant/provision/setup-tails-builder
+++ b/vagrant/provision/setup-tails-builder
@@ -44,6 +44,7 @@ if [ "${TAILS_PROXY_TYPE}" = "vmproxy" ]; then
# Install custom configuration for apt-cacher-ng and restart
install -o root -g root -m 644 /vagrant/provision/assets/acng.conf \
/etc/apt-cacher-ng/acng.conf
+ rm -f /etc/apt-cacher-ng/network.conf
[ "${TAILS_OFFLINE_MODE}" = 1 ] || TAILS_OFFLINE_MODE=0
echo "Offlinemode: ${TAILS_OFFLINE_MODE}" > /etc/apt-cacher-ng/network.conf
if [ -n "${TAILS_ACNG_PROXY:-}" ]; then