dm/lvm: make usage of new udev event rules optionally

diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index ba9cfb4ba239ebacfc243e3880fdda15cbc07702..0aecb2aa55080c1b39f065827a715b61e2b4905b 100755 (executable)
--- 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 bb655dbe33a0886ed20eba39ea1e26b9686fffde..30950272bed19272241427d58d535954779fda8f 100755 (executable)
--- 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"