This also folds in support for ro and rw flags.
---
init | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/init b/init
index 7b0c61b..581c2b9 100755
--- a/init
+++ b/init
@@ -79,10 +79,16 @@ udevadm settle --timeout=30
source_all pre-mount
echo "Trying to mount rootfs $root"
-rwopt="$(getarg rw)" || rwopt="ro"
+if rflags="$(getarg rootflags)"; then
+ rflags="${rflags#rootflags=}"
+ getarg rw >/dev/null && rflags="${rflags},rw" || rflags="${rflags},ro"
+else
+ getarg rw >/dev/null && rflags=rw || rflags=ro
+fi
[ -e "$root" ] || emergency_shell
-ln -s "$root" /dev/root
-mount -o $rwopt /dev/root $NEWROOT || emergency_shell
+ln -s "$root" /dev/root
+fstype="$(getarg rootfstype)" && fstype="-t ${fstype#rootfstype=}"
+mount $fstype -o $rflags /dev/root $NEWROOT || emergency_shell
INIT=$(getarg init)
[ "$INIT" ] || {
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
