From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 20 Mar 2013 18:25:50 +0000 (-0700)
Subject: Refresh dracut module setup
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=b9676003665ceee5a859253dde3305eecc215016;p=zfs.git

Refresh dracut module setup

60-zpool.rules was retired some time ago in favor of 69-vdev.rules.
Additionally, there is no guarentee a zpool.cache file exists so
only install it conditionally upon its existance.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
---

diff --git a/dracut/90zfs/module-setup.sh.in b/dracut/90zfs/module-setup.sh.in
index 23ebc36..6eb6843 100755
--- a/dracut/90zfs/module-setup.sh.in
+++ b/dracut/90zfs/module-setup.sh.in
@@ -29,9 +29,8 @@ installkernel() {
 
 install() {
 	inst_rules @udevruledir@/90-zfs.rules
-	inst_rules @udevruledir@/60-zpool.rules
+	inst_rules @udevruledir@/69-vdev.rules
 	inst_rules @udevruledir@/60-zvol.rules
-	inst @sysconfdir@/zfs/zpool.cache
 	dracut_install @sbindir@/zfs
 	dracut_install @sbindir@/zpool
 	dracut_install @udevdir@/vdev_id
@@ -41,6 +40,10 @@ install() {
 	inst_hook cmdline 95 "$moddir/parse-zfs.sh"
 	inst_hook mount 98 "$moddir/mount-zfs.sh"
 
+	if [ -e @sysconfdir@/zfs/zpool.cache ]; then
+		inst @sysconfdir@/zfs/zpool.cache
+	fi
+
 	# Synchronize initramfs and system hostid
 	TMP=`mktemp`
 	AA=`hostid | cut -b 1,2`