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>
install() {
inst_rules @udevruledir@/90-zfs.rules
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_rules @udevruledir@/60-zvol.rules
- inst @sysconfdir@/zfs/zpool.cache
dracut_install @sbindir@/zfs
dracut_install @sbindir@/zpool
dracut_install @udevdir@/vdev_id
dracut_install @sbindir@/zfs
dracut_install @sbindir@/zpool
dracut_install @udevdir@/vdev_id
inst_hook cmdline 95 "$moddir/parse-zfs.sh"
inst_hook mount 98 "$moddir/mount-zfs.sh"
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`
# Synchronize initramfs and system hostid
TMP=`mktemp`
AA=`hostid | cut -b 1,2`