X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=dracut%2F90zfs%2Fparse-zfs.sh;h=25f2dfbacc5628dcd84dc1f315f3afe8ec942c82;hb=7f4afd300b753ee7e0ce1f8d12c098119193001b;hp=ef3d058ac2b418fda3ed81ec42ede1e98cccaf1c;hpb=ae26d0465a234d7b340566287908c78fe24901e1;p=zfs.git

diff --git a/dracut/90zfs/parse-zfs.sh b/dracut/90zfs/parse-zfs.sh
index ef3d058..25f2dfb 100755
--- a/dracut/90zfs/parse-zfs.sh
+++ b/dracut/90zfs/parse-zfs.sh
@@ -1,23 +1,50 @@
+#!/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.  "
+	warn "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 ;;
-esac
+	""|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
 
-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"
+		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
-	fi
-	zpool list -H | while read fs rest ; do zpool export "$fs" ; done
-fi
+
+		info "ZFS: Set ${root} as bootfs."
+		;;
+esac
+
+# 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