From f68a97af7ce475c1efcd7a7208b60995adf59d52 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <ckb@riseup.net>
Date: Thu, 21 Mar 2019 08:31:14 +0100
Subject: [PATCH] Fix apt-cacher-ng cache shrinking (refs: #16020).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The “acngtool shrink” command never fails (at least with apt-cacher-ng
2-2, in stretch), which might explain why the missing sudo call was
missed for so long: the insufficient rights as an unprivileged user
don't lead to an non-zero exit code, and to the printing of a warning
message.
---
vagrant/provision/assets/build-tails | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails
index 7ead5cdb35b..1a0d08307c2 100755
--- a/vagrant/provision/assets/build-tails
+++ b/vagrant/provision/assets/build-tails
@@ -138,7 +138,7 @@ if [ "${TAILS_PROXY_TYPE}" = "vmproxy" ]; then
# of it is used there is 5G before each build, which should be
# enough for any build, even if we have to download a complete set
# of new packages for a new Debian release.
- /usr/lib/apt-cacher-ng/acngtool shrink 10G -f || \
+ as_root_do /usr/lib/apt-cacher-ng/acngtool shrink 10G -f || \
echo "The clean-up of apt-cacher-ng's cache failed: this is" \
"not fatal and most likely just means that some disk" \
"space could not be reclaimed -- in order to fix that" \
--
GitLab