Skip to content

Commit 009c4bd

Browse files
author
Daniel Ruthardt
committed
🚸 Improve ro detection for when both are present
Signed-off-by: Daniel Ruthardt <druthardt@linuxfoundation.org>
1 parent 4f3ded8 commit 009c4bd

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

‎debian/changelog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cloud-initramfs-tools (0.49) noble; urgency=medium
22

33
[ Daniel Ruthardt ]
44
* overlayroot: Add support for multiple overlay devices
5+
* overlayroot: Improve ro detection for when both ro and rw are present
56

67
-- Daniel Ruthardt <druthardt@linuxfoundation.org> Thu, 8 Feb 2024 13:24:00 -0600
78

‎overlayroot/scripts/init-bottom/overlayroot‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,8 @@ overlayroot_driver=${_RET_common_driver}
713713

714714
read cmdline </proc/cmdline
715715
cmdline=" $cmdline "
716-
[ "${cmdline#* ro }" != "$cmdline" ] && cmdline_ro=true || cmdline_ro=false
716+
if ([ "${cmdline#* ro }" != "$cmdline" ] && [ "${cmdline#* ro }" != *rw* ]) && cmdline_ro=true || \
717+
cmdline_ro=false
717718

718719
if [ "${overlayroot_driver:-auto}" = "auto" ]; then
719720
search_fs_driver overlay overlayfs ||

0 commit comments

Comments
 (0)