summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing
diff options
context:
space:
mode:
authorCyril Brulebois <ckb@riseup.net>2019-05-21 18:28:03 +0200
committerCyril Brulebois <ckb@riseup.net>2019-05-21 18:28:03 +0200
commit4e2bafaf1ae16a6318d2d63dd889f648e09b17f8 (patch)
tree5b42a573d3efce818f73f66c0f8ff0131a5f46db /config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing
parent482e31d3104deebd6e6a0e84608d7e322afe958e (diff)
parent432e8a1bb02d38c0eef68a8d64cdb8aaecb31887 (diff)
Merge branch 'web/release-3.14'
Conflicts: wiki/src/inc/stable_amd64_img_gpg_signature_output.html wiki/src/inc/stable_amd64_iso_gpg_signature_output.html Resolve conflicts by picking the signatures from the web/release-3.14 branch, the other ones were just fixups for the previous release.
Diffstat (limited to 'config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing')
-rw-r--r--config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing15
1 files changed, 0 insertions, 15 deletions
diff --git a/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing b/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing
index 5dc6a22..55e0a01 100644
--- a/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing
+++ b/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing
@@ -26,21 +26,6 @@ rm /etc/console-setup/cached_setup_keyboard.sh
rm /var/cache/ldconfig/aux-cache
rm /var/lib/systemd/catalog/database
-# Delete non-deterministically generated files, that should not be shared among
-# all Tails systems anyway. We don't ship SSHd, so we don't bother generating
-# them at boot.
-# We remove with -f due to a suspected race condition: it seems that
-# .../authentication/sphere/S.gpg-agent can be removed (by gpg-agent?)
-# *right after* `rm -r` has listed it, so that when `rm` tries to
-# remove it, it doesn't exist any more and it fails.
-if [ -d /var/lib/monkeysphere/authentication/ ]; then
- rm -rf /var/lib/monkeysphere/authentication/
-else
- echo 'Cannot remove /var/lib/monkeysphere/authentication/:' \
- 'directory does not exist' >&2
- exit 1
-fi
-
# Empty non-deterministically generated file. If it exists and is empty, systemd
# will automatically set up a new unique ID. But if does not exist, systemd
# will populate /etc with preset unit settings, which will for example re-enable