summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-09-16 16:42:18 +0200
committeranonym <anonym@riseup.net>2016-09-16 21:15:58 +0200
commit7f88af1da63ef1697a5e00ff186aa03ab2f1e672 (patch)
treeb42eb0d486b32e0c367ad361ab26dec5347225bd
parentf8e35e3c67cbaeb6370bbfcb6c89b4d74d5b72fd (diff)
Revert "Run our initramfs memory erasure hook earlier."feature/10733-reverted
This reverts commits 185f53877ba90b621dbade4aebc4903e07e6ea82 and 71ac15e8a9d84bbb66260530bbdf177fa8addffc. Since we introduced this in Tails 2.6~rc1 we see a lot more issues with memory wiping both in our automated tests (locally, and on Jenkins) and among actual users. Refs: #10733, #11786
-rwxr-xr-xconfig/chroot_local-hooks/65-initramfs-scripts14
-rwxr-xr-xconfig/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/memory_wipe (renamed from config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/memory_wipe)0
2 files changed, 0 insertions, 14 deletions
diff --git a/config/chroot_local-hooks/65-initramfs-scripts b/config/chroot_local-hooks/65-initramfs-scripts
deleted file mode 100755
index b69cb3d..0000000
--- a/config/chroot_local-hooks/65-initramfs-scripts
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-
-echo "Adding memory_wipe to the prereqs of all other init-top initramfs scripts"
-
-(
- cd /usr/share/initramfs-tools/scripts/init-top
- for script in * ; do
- [ "$script" != memory_wipe ] || continue
- sed --regexp-extended -i \
- -e 's/^(PREREQS?)="(.*)"/\1="memory_wipe \2"/' \
- "$script"
- done
-)
diff --git a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/memory_wipe b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/memory_wipe
index 794f5d8..794f5d8 100755
--- a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/memory_wipe
+++ b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/memory_wipe