X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=dracut%2F90zfs%2Fmount-zfs.sh;h=49d68466c556b6e3db65ca5c91a85b88150dba08;hb=7f4afd300b753ee7e0ce1f8d12c098119193001b;hp=6b742e348cea6e412907e7339db1a9cda33dac4d;hpb=ae26d0465a234d7b340566287908c78fe24901e1;p=zfs.git

diff --git a/dracut/90zfs/mount-zfs.sh b/dracut/90zfs/mount-zfs.sh
index 6b742e3..49d6846 100755
--- a/dracut/90zfs/mount-zfs.sh
+++ b/dracut/90zfs/mount-zfs.sh
@@ -2,9 +2,70 @@
 
 . /lib/dracut-lib.sh
 
-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 
+ZPOOL_FORCE=""
+
+if getargbool 0 zfs_force -y zfs.force -y zfsforce ; then
+	warn "ZFS: Will force-import pools if necessary."
+	ZPOOL_FORCE="-f"
 fi
+
+case "$root" in
+	zfs:*)
+		# We have ZFS modules loaded, so we're able to import pools now.
+		if [ "$root" = "zfs:AUTO" ] ; then
+			# Need to parse bootfs attribute
+			info "ZFS: Attempting to detect root from imported ZFS pools."
+
+			# Might be imported by the kernel module, so try searching before
+			# we import anything.
+			zfsbootfs=`zpool list -H -o bootfs | sed 'q'`
+			if [ "$?" != "0" ] || [ "$zfsbootfs" = "" ] || \
+				[ "$zfsbootfs" = "no pools available" ] ; then
+				# Not there, so we need to import everything.
+				info "ZFS: Attempting to import additional pools."
+				zpool import -N -a ${ZPOOL_FORCE}
+				zfsbootfs=`zpool list -H -o bootfs | sed 'q'`
+				if [ "$?" != "0" ] || [ "$zfsbootfs" = "" ] || \
+					[ "$zfsbootfs" = "no pools available" ] ; then
+					rootok=0
+					pool=""
+
+					warn "ZFS: No bootfs attribute found in importable pools."
+
+					# Re-export everything since we're not prepared to take
+					# responsibility for them.
+					zpool list -H | while read fs rest ; do
+						zpool export "$fs"
+					done
+
+					return 1
+				fi
+			fi
+			info "ZFS: Using ${zfsbootfs} as root."
+		else
+			# Should have an explicit pool set, so just import it and we're done.
+			zfsbootfs="${root#zfs:}"
+			pool="${zfsbootfs%%/*}"
+			if ! zpool list -H $pool > /dev/null ; then
+				# pool wasn't imported automatically by the kernel module, so
+				# try it manually.
+				info "ZFS: Importing pool ${pool}..."
+				if ! zpool import -N ${ZPOOL_FORCE} $pool ; then
+					warn "ZFS: Unable to import pool ${pool}."
+					rootok=0
+
+					return 1
+				fi
+			fi
+		fi
+
+		# Above should have left our rpool imported and pool/dataset in $root.
+		# We need zfsutil for non-legacy mounts and not for legacy mounts.
+		mountpoint=`zfs get -H -o value mountpoint $zfsbootfs`
+		if [ "$mountpoint" = "legacy" ] ; then
+			mount -t zfs "$zfsbootfs" "$NEWROOT" && ROOTFS_MOUNTED=yes
+		else
+			mount -o zfsutil -t zfs "$zfsbootfs" "$NEWROOT" && ROOTFS_MOUNTED=yes
+		fi
+		;;
+esac