summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-12-02 11:45:35 +0000
committerintrigeri <intrigeri@boum.org>2018-12-02 12:46:16 +0000
commit6ce0bf4378e15a0cfa7ae45fd9989cce32661887 (patch)
tree0e920a8a4789326b602d0d0e2bd6be82cbd38829 /vagrant
parent7ebb6acbbf8ba977d86fa67fa87d8d92fb9f54ec (diff)
Disable irrelevant recurring jobs in Vagrant build box (refs: #16177)
They are useless and might explain some FTBFS where mksquashfs is reaped by the OOM killer.
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/definitions/tails-builder/postinstall.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/vagrant/definitions/tails-builder/postinstall.sh b/vagrant/definitions/tails-builder/postinstall.sh
index 76c02f9..8968920 100755
--- a/vagrant/definitions/tails-builder/postinstall.sh
+++ b/vagrant/definitions/tails-builder/postinstall.sh
@@ -30,6 +30,12 @@ EOF
cat > /etc/apt/apt.conf.d/99retries << EOF
APT::Acquire::Retries "20";
EOF
+# This effectively disables apt-daily*.{timer,service}, which might
+# interfere with an ongoing build. We run apt-get
+# {update,dist-upgrade,clean} ourselves in setup-tails-builder.
+cat > /etc/apt/apt.conf.d/99periodic << EOF
+APT::Periodic::Enable "0";
+EOF
echo "I: Install Tails APT repo signing key."
apt-key add /tmp/tails.binary.gpg
@@ -152,6 +158,12 @@ localepurge
apt-get -y remove localepurge
rm -f "${TEMPFILE}"
+echo "I: Disabling irrelevant timers"
+# By default we reboot the system between each build, which makes this
+# timer useless. Besides, it is started 15 minutes after boot, which
+# has potential to interfere with an ongoing build.
+systemctl mask systemd-tmpfiles-clean.timer
+
echo "I: Cleaning up..."
apt-get -y autoremove
apt-get clean