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>
This commit is contained in:
Brian Behlendorf 2013-03-20 11:25:50 -07:00
parent 68a2e016c8
commit b967600366

View File

@ -29,9 +29,8 @@ installkernel() {
install() { install() {
inst_rules @udevruledir@/90-zfs.rules 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@/zfs
dracut_install @sbindir@/zpool dracut_install @sbindir@/zpool
dracut_install @udevdir@/vdev_id dracut_install @udevdir@/vdev_id
@ -41,6 +40,10 @@ install() {
inst_hook cmdline 95 "$moddir/parse-zfs.sh" inst_hook cmdline 95 "$moddir/parse-zfs.sh"
inst_hook mount 98 "$moddir/mount-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 # Synchronize initramfs and system hostid
TMP=`mktemp` TMP=`mktemp`
AA=`hostid | cut -b 1,2` AA=`hostid | cut -b 1,2`