From 99fd62e3bebed1861902915379973020860dbb5f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 29 Sep 2009 18:29:34 +0200 Subject: [PATCH] dm/lvm: make usage of new udev event rules optionally --- modules.d/90dmraid/install | 11 ++++++++--- modules.d/90lvm/install | 6 ++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install index ba9cfb4b..0aecb2aa 100755 --- a/modules.d/90dmraid/install +++ b/modules.d/90dmraid/install @@ -1,5 +1,12 @@ #!/bin/bash -dracut_install dmraid partx kpartx dmeventd +dracut_install dmraid partx kpartx + +if which dmeventd &>/dev/null ; then + dracut_install dmeventd + dracut_install /usr/lib*/libdmraid-events-isw.so* + inst_rules 10-dm.rules 12-dm-disk.rules 95-dm-notify.rules +fi + inst "$moddir/dmraid.sh" /sbin/dmraid_scan if [ ! -x /lib/udev/vol_id ]; then @@ -9,6 +16,4 @@ fi inst_rules "$moddir/61-dmraid-imsm.rules" inst "$moddir/dmraid-cleanup.sh" /sbin/dmraid-cleanup inst_hook pre-trigger 30 "$moddir/parse-dm.sh" -dracut_install /usr/lib*/libdmraid-events-isw.so* -inst_rules 10-dm.rules 12-dm-disk.rules 95-dm-notify.rules diff --git a/modules.d/90lvm/install b/modules.d/90lvm/install index bb655dbe..30950272 100755 --- a/modules.d/90lvm/install +++ b/modules.d/90lvm/install @@ -8,8 +8,10 @@ if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then [ -f /etc/lvm/lvm.conf ] && inst /etc/lvm/lvm.conf fi -dracut_install /lib*/libdevmapper-event-lvm2mirror.so* /lib*/libdevmapper-event-lvm2snapshot.so* -inst_rules 10-dm.rules 12-dm-disk.rules 95-dm-notify.rules 11-lvm.rules +if [ -e /lib/udev/rules.d/11-lvm.rules ]; then + dracut_install /lib*/libdevmapper-event-lvm2mirror.so* /lib*/libdevmapper-event-lvm2snapshot.so* + inst_rules 10-dm.rules 12-dm-disk.rules 95-dm-notify.rules 11-lvm.rules +fi inst "$moddir/lvm_scan.sh" /sbin/lvm_scan inst_hook cmdline 30 "$moddir/parse-lvm.sh"