From ebd5615489d017ac232550188133cd7f15178c15 Mon Sep 17 00:00:00 2001 From: David Dillow Date: Mon, 1 Jun 2009 21:43:07 -0400 Subject: [PATCH] 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. --- modules.d/95rootfs-block/mount-root.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh index 77a6b37d..a5741d16 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