From: Pavel Zhukov <pavel@zhukoff.net>
Date: Tue, 25 Mar 2025 09:40:14 +0000 (+0100)
Subject: overlayfs-etc: Unmount /sys and /proc before init
X-Git-Tag: 2025-04-walnascar~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94b3f86bac16ac3be468e23e1f6aad69cdf502d3;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

overlayfs-etc: Unmount /sys and /proc before init

/sys filesystem mounted by the preinit script causes shadowing of
/sys/firmware/efi/ by double /sys mounting on systemd enabled systems
[1]. As the result EFI tooling is broken

[1]
sysfs on /sys type sysfs (rw,nosuid,nodev,noexec,relatime)
efivarfs on /sys/firmware/efi/efivars type efivarfs (rw,nosuid,nodev,noexec,relatime)
sysfs on /sys type sysfs (rw,relatime)

Signed-off-by: Pavel Zhukov <pavel@zhukoff.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/files/overlayfs-etc-preinit.sh.in b/meta/files/overlayfs-etc-preinit.sh.in
index b05e3957a38..973887649af 100644
--- a/meta/files/overlayfs-etc-preinit.sh.in
+++ b/meta/files/overlayfs-etc-preinit.sh.in
@@ -48,5 +48,8 @@ else
     echo "PREINIT: Mounting </data> failed!"
 fi
 
+umount /sys
+umount /proc
+
 echo "PREINIT: done; starting </sbin/init>"
 exec {SBIN_INIT_NAME}