Move processing root options into a pre-udev hook.

Also make changes that will make it easier to udevify resuming
from hibernate and mounting root.

modules.d/99base/mount-root.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
-[ "$root" ] && mount $fstype -o "$rflags" "$root" "$NEWROOT" && \
+if [ ! -s /.resume -a "$root" ]; then
-    ROOTFS_MOUNTED=yes
+    mount $fstype -o "$rflags" "$root" "$NEWROOT" && ROOTFS_MOUNTED=yes
+fi

modules.d/99base/parse-root-opts.sh

@@ -1,24 +1,27 @@
 #!/bin/sh
-[ "$root" ] || {
+if resume=$(getarg resume=) && ! getarg noresume; then 
-    root=$(getarg root=)
+    export resume
-    case $root in
+    echo "$resume" >/.resume
+else
+    unset resume
+fi
+
+root=$(getarg root=)
+case $root in
     LABEL=*) root=${root#LABEL=}
     root="$(echo $root |sed 's,/,\\x2f,g')"
     root="/dev/disk/by-label/${root}" ;;
     UUID=*) root="/dev/disk/by-uuid/${root#UUID=}" ;;
     '') echo "Warning: no root specified"
         root="/dev/sda1" ;;
-    esac
+esac
-}
 
-[ "$rflags" ] || {
+if rflags="$(getarg rootflags=)"; then
-    if rflags="$(getarg rootflags=)"; then
     getarg rw && rflags="${rflags},rw" || rflags="${rflags},ro"
-    else
+else
     getarg rw && rflags=rw || rflags=ro
-    fi
+fi
-}
+
+fstype="$(getarg rootfstype=)" && fstype="-t ${fstype}"
 
-[ "$fstype" ] || {
+export fstype rflags root
-    fstype="$(getarg rootfstype=)" && fstype="-t ${fstype}"
-}

modules.d/99base/resume.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
-resume=$(getarg resume=) && ! getarg noresume && [ -b "$resume" ] && {
+[ -s /.resume -a -b "$resume" ] && {
     # parsing the output of ls is Bad, but until there is a better way...
     ls -lH "$resume" | ( 
 	read x x x x maj min x;
 	echo "${maj%,}:$min"> /sys/power/resume)
+    >/.resume
 }