SVN: geninitrd/trunk/geninitrd
arekm
arekm at pld-linux.org
Thu Feb 3 19:45:09 CET 2011
Author: arekm
Date: Thu Feb 3 19:45:09 2011
New Revision: 12114
Modified:
geninitrd/trunk/geninitrd
Log:
Mount rootfs from initramfs with rootfsflags options.
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Thu Feb 3 19:45:09 2011
@@ -764,7 +764,9 @@
device=$rootdev
fi
- mount -t $rootfs -r $device /newroot
+ [ -n "$ROOTFSFLAG" ] && ROOTFSFLAGS="-o $ROOTFSFLAGS"
+
+ mount -t $rootfs -r $device $ROOTFSFLAGS /newroot
init="$(echo "$CMDLINE" | busybox awk '/init=\// { gsub(/.*init=/,NIL,$0); gsub(/ .*/,NIL,$0); print }')"
if [ -z "$init" -o ! -x "/newroot$init" ]; then
init=/sbin/init
@@ -1229,6 +1231,9 @@
if [ "${arg##root=}" != "${arg}" ]; then
ROOT=${arg##root=}
fi
+ if [ "${arg##rootfsflags=}" != "${arg}" ]; then
+ ROOTFSFLAGS=${arg##rootfsflags=}
+ fi
done
# make debugshell() invoke subshell if $DEBUGINITRD=sh
More information about the pld-cvs-commit
mailing list