Merge ~danielruthardt/cloud-initramfs-tools:fix/root-ro-detection into cloud-initramfs-tools:master

[Daniel Ruthardt]

🚸 Improve ro detection for when both are present

🚸 Improve ro detection for when both are present

Improve root file system "ro" detection for when both "ro" and "rw" are present in the kernel command line.
The above is helpful for situations when one only controls an append to the kernel command line and is not in complete control of the entire command line to be able to remove the "ro".

The fix/improvement allows for multiple "ro" and "rw" arguments to be present and will correctly use the last one present, just like the kernel would.

Unmerged commits

116f011... by Daniel Ruthardt on 2024-02-19

🐛 Reimplement weak and faulty ro/rw detection

Signed-off-by: Daniel Ruthardt <email address hidden>

diff --git a/overlayroot/scripts/init-bottom/overlayroot b/overlayroot/scripts/init-bottom/overlayroot
index 5c13811..7e23a55 100755
--- a/overlayroot/scripts/init-bottom/overlayroot
+++ b/overlayroot/scripts/init-bottom/overlayroot
@@ -698,9 +698,15 @@ OVERLAYROOT_DEBUG=${_RET_common_debug:-${OVERLAYROOT_DEBUG}}
 dir_prefix=${_RET_common_dir:-"/overlay"}
 overlayroot_driver=${_RET_common_driver}
 
+cmdline_ro=false
 read cmdline </proc/cmdline
 cmdline=" $cmdline "
-[ "${cmdline#* ro }" != "$cmdline" ] && cmdline_ro=true || cmdline_ro=false
+for param in $cmdline; do
+	case "$param" in
+		ro) cmdline_ro=true ;;
+		rw) cmdline_ro=false ;;
+	esac
+done
 
 if [ "${overlayroot_driver:-auto}" = "auto" ]; then
 	search_fs_driver overlay overlayfs ||