fix(base): ensure that /run survives switch_root

Ensure /run survives switch_root not only systemd enabled initramfs,
but initramfs without systemd.

This change makes systemd and non-systemd initramfs behaves similarly.

This change also enables the newly added test case for hooks to pass
on the busybox CI container.

This PR has no impact on systemd enabled initramfs.

diff --git a/.github/workflows/daily-busybox-x64.yml b/.github/workflows/daily-busybox-x64.yml
index 4b2ee2b6f7210a100d7e05074be1d427d2b94685..7e00d0f833308e0db081f7db1b8a2007ae5b6157 100644 (file)
--- a/.github/workflows/daily-busybox-x64.yml
+++ b/.github/workflows/daily-busybox-x64.yml
@@ -32,6 +32,7 @@ jobs:
                     - '11'
                     - '12'
                     - '13'
+                    - '14'
                     - '20'
                     - '26'
                     - '50'

diff --git a/modules.d/80base/init.sh b/modules.d/80base/init.sh
index 26b554ab507c094bba77000d90eda1e552569698..36e7dbaf7c4e4dcab42825bf2bba1d6bf80b2b14 100755 (executable)
--- a/modules.d/80base/init.sh
+++ b/modules.d/80base/init.sh
@@ -365,6 +365,8 @@ if ! [ -d "$NEWROOT"/run ]; then
     NEWRUN=/dev/.initramfs
     mkdir -m 0755 -p "$NEWRUN"
     mount --rbind /run/initramfs "$NEWRUN"
+else
+    mount --move /run "$NEWROOT"/run
 fi
 
 wait_for_loginit