Update for Dracut-010

Update Dracut module for Dracut-010 and fix race conditions that
caused boot to fail on MP systems.  Add support for zfs_force flag
and parsing of spl_hostid from kernel command line.

Signed-off-by: Brian Behlendorf <[email protected]>

1 files changed, 46 insertions, 20 deletions

diff --git a/dracut/90zfs/parse-zfs.sh b/dracut/90zfs/parse-zfs.sh
index ef3d058ac..f8974b95e 100755
--- a/dracut/90zfs/parse-zfs.sh
+++ b/dracut/90zfs/parse-zfs.sh
@@ -1,23 +1,49 @@
+#!/bin/sh
+
+. /lib/dracut-lib.sh
+
+# Let the command line override our host id.
+spl_hostid=`getarg spl_hostid=`
+if [ "${spl_hostid}" != "" ] ; then
+  info "ZFS: Using hostid from command line: ${spl_hostid}"
+  echo "${spl_hostid}" > /etc/hostid
+elif [ -f /etc/hostid ] ; then
+  info "ZFS: Using hostid from /etc/hostid: `cat /etc/hostid`"
+else
+  warn "ZFS: No hostid found on kernel command line or /etc/hostid.  ZFS pools may not import correctly."
+fi
+
 case "$root" in
-    zfs:FILESYSTEM=*|FILESYSTEM=*)
-	root="${root#zfs:}"
-	root="zfs:${root#FILESYSTEM=}"
-        rootfs="zfs"
-        rootok=1 ;;
-    zfs:ZFS=*|ZFS=*)
-	root="${root#zfs:}"
-	root="zfs:${root#ZFS=}"
-        rootfs="zfs"
-        rootok=1 ;;
+  ""|zfs|zfs:)
+    # We'll take root unset, root=zfs, or root=zfs:
+    # No root set, so we want to read the bootfs attribute.  We can't do
+    # that until udev settles so we'll set dummy values and hope for the
+    # best later on.
+    root="zfs:AUTO"
+    rootok=1
+
+    info "ZFS: Enabling autodetection of bootfs after udev settles."
+    ;;
+
+  ZFS\=*|zfs:*|zfs:FILESYSTEM\=*|FILESYSTEM\=*)
+    # root is explicit ZFS root.  Parse it now.
+    # We can handle a root=... param in any of the following formats:
+    # root=ZFS=rpool/ROOT
+    # root=zfs:rpool/ROOT
+    # root=zfs:FILESYSTEM=rpool/ROOT
+    # root=FILESYSTEM=rpool/ROOT
+
+    # Strip down to just the pool/fs
+    root="${root#zfs:}"
+    root="${root#FILESYSTEM=}"
+    root="zfs:${root#ZFS=}"
+    rootok=1
+
+    info "ZFS: Set ${root} as bootfs."
+    ;;
 esac
 
-if [ "$rootok" != "1" ] ; then
-	zpool import -aN
-	zfsbootfs=`zpool list -H -o bootfs | grep -v ^-$ -m 1`
-	if [ -n "$zfsbootfs" ] ; then
-		root="zfs:$zfsbootfs"
-		rootfs="zfs"
-		rootok=1
-	fi
-	zpool list -H | while read fs rest ; do zpool export "$fs" ; done
-fi
+# Make sure Dracut is happy that we have a root and will wait for ZFS
+# modules to settle before mounting.
+ln -s /dev/null /dev/root 2>/dev/null
+echo '[ -e /dev/zfs ]' > $hookdir/initqueue/finished/zfs.sh