From: David Dillow <dave@thedillows.org>
Date: Tue, 2 Jun 2009 01:43:07 +0000 (-0400)
Subject: strip block: off root= when using the mount hooks
X-Git-Tag: 0.1~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ebd5615489d017ac232550188133cd7f15178c15;p=thirdparty%2Fdracut.git

strip block: off root= when using the mount hooks

I'm not sure they are still used, but if so they need to
trim the prefix.
---

diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
index 77a6b37d5..a5741d167 100755
--- a/modules.d/95rootfs-block/mount-root.sh
+++ b/modules.d/95rootfs-block/mount-root.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-if [ ! -s /.resume -a "$root" ]; then
-    mount ${fstype:--t auto} -o "$rflags" "$root" "$NEWROOT" && ROOTFS_MOUNTED=yes
+if [ ! -s /.resume -a -n "$root" -a -z "${root%%block:*}" ]; then
+    mount ${fstype:--t auto} -o "$rflags" "${root#block:}" "$NEWROOT" && ROOTFS_MOUNTED=yes
 fi