X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=dracut%2F90zfs%2Fmodule-setup.sh.in;h=6eb6843819aa43e0202ff7e0fabf657815b77ea8;hb=c76955eaa5477a71f711e6865a923e7055f8b3cb;hp=c01915e82eee71667b40e358bb106794edbaab60;hpb=e8753fb4f03aaa371028aaec145449f2610229cf;p=zfs.git

diff --git a/dracut/90zfs/module-setup.sh.in b/dracut/90zfs/module-setup.sh.in
index c01915e..6eb6843 100755
--- a/dracut/90zfs/module-setup.sh.in
+++ b/dracut/90zfs/module-setup.sh.in
@@ -29,20 +29,21 @@ 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/zdev.conf
-	inst @sysconfdir@/zfs/zpool.cache
 	dracut_install @sbindir@/zfs
 	dracut_install @sbindir@/zpool
-	dracut_install @bindir@/zpool_layout
-	dracut_install @udevdir@/zpool_id
+	dracut_install @udevdir@/vdev_id
 	dracut_install @udevdir@/zvol_id
 	dracut_install mount.zfs
 	dracut_install hostid
 	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`