Permit both mountpoint=legacy and mountpoint=/ in initrd
authorManuel Amador (Rudd-O) <rudd-o@rudd-o.com>
Wed, 6 Apr 2011 16:52:58 +0000 (09:52 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 7 Apr 2011 17:31:02 +0000 (10:31 -0700)
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
dracut/90zfs/mount-zfs.sh

index 6b742e3..9c753d9 100755 (executable)
@@ -6,5 +6,11 @@ if [ "$rootfs" = "zfs" ]; then
     zfsrootfs=`echo "$root" | sed 's|^zfs:||'`
     zfspool=`echo "$zfsrootfs" | sed 's|/.*||g'`
     zpool import -N "$zfspool"
-    mount -o zfsutil -t "$rootfs" "$zfsrootfs" "$NEWROOT" && ROOTFS_MOUNTED=yes 
+    mount -o zfsutil -t "$rootfs" "$zfsrootfs" "$NEWROOT"
+    if [ "$?" = "0" ]
+    then
+       ROOTFS_MOUNTED=yes
+    else
+        mount -t "$rootfs" "$zfsrootfs" "$NEWROOT" && ROOTFS_MOUNTED=yes
+   fi
 fi