initfs shutdown: adapt to unmounted /run/initramfs
Bind mount / to run/initramfs where it was durinig system operation
if run/initramfs/shutdown is missing
Between v254 and v254.1 systemd decided not to mount /run/initramfs
recursively, with the assumption it was unused since its available
at /, but this means that the update script and image files to be
applied are not available at the runtime location. However we can
restore this mount ourselves.
Adopt and use the api variable used in init
Signed-off-by: Milton Miller <mdmii@outlook.com>
diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh
index 46a1d48..3234004 100644
--- a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh
+++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh
@@ -14,6 +14,12 @@
else
umount_proc=
fi
+api=/run/initramfs
+if [ ! -f $api/shutdown ]
+then
+ mkdir -p $api
+ mount --bind / $api
+fi
# Remove an empty oldroot, that means we are not invoked from systemd-shutdown
rmdir /oldroot 2>/dev/null
@@ -33,8 +39,8 @@
done
set +x
-update=/run/initramfs/update
-image=/run/initramfs/image-
+update=$api/update
+image=$api/image-
wdt="-t 1 -T 5"
wdrst="-T 15"