summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2020-04-18 14:39:42 +0200
committeranonym <anonym@riseup.net>2020-04-20 10:55:40 +0200
commitb9aab30aeb7f34b31b71c513c72953137a80ba78 (patch)
tree4672d3c2b91c2bc0cf8575fc6990aa7ece92551a
parent2289df218b33b343cd3799f990febb6beff4f8a2 (diff)
Use util-linux' mount/umount in initramfs used during shutdown.bugfix/15146-overlayfs-memory-erasure+force-all-tests
When migrating to overlayfs we had issues with the overlay rw branch not being wiped but switching mount/umount from BusyBox' to util-linux' seems to bring the error rate from 10% to 0.5%. Will-fix: #15146
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/initramfs-restore6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/chroot_local-includes/usr/local/lib/initramfs-restore b/config/chroot_local-includes/usr/local/lib/initramfs-restore
index 7f006a9..aaefd77 100755
--- a/config/chroot_local-includes/usr/local/lib/initramfs-restore
+++ b/config/chroot_local-includes/usr/local/lib/initramfs-restore
@@ -16,4 +16,10 @@ WORKDIR=$(/bin/mktemp -d)
/bin/mv "$WORKDIR"/main/* /run/initramfs/
+# When migrating to overlayfs we had issues with the overlay rw branch
+# not being wiped (#15146) but switching mount/umount from BusyBox' to
+# util-linux' seems to bring the error rate from 10% to 0.5%.
+rm /run/initramfs/usr/bin/mount /run/initramfs/usr/bin/umount
+cp /bin/mount /bin/umount /run/initramfs/usr/bin/
+
/bin/rm -rf "$WORKDIR"