90dm: install libdevmapper-event* for 90dm and cleanup 90dmraid

diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh
index c924ec79ef95782a69828d3ef67fd1dbdd1f07b3..e7c813de23f2ad9698d8fa87d65233d75fb5550b 100755 (executable)
--- a/modules.d/90dm/module-setup.sh
+++ b/modules.d/90dm/module-setup.sh
@@ -21,10 +21,16 @@ install() {
     inst dmsetup
 
     type -P dmeventd >/dev/null && dracut_install dmeventd
-    inst_rules 10-dm.rules 95-dm-notify.rules
+
+    for _i in {"$libdir","$usrlibdir"}/libdmraid-events*.so; do
+        [ -e "$_i" ] && dracut_install "$_i"
+    done
+
+    inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
     # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
     # files, but provides the one below:
     inst_rules 64-device-mapper.rules
+
     inst_rules "$moddir/11-dm.rules"
 
     inst_hook shutdown 30 "$moddir/dm-shutdown.sh"

diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh
index fa20880220035121964931e4fc003c508d62df3d..5d02eb8e80aaa9c5293e15d96dc15540f0be5d31 100755 (executable)
--- a/modules.d/90dmraid/module-setup.sh
+++ b/modules.d/90dmraid/module-setup.sh
@@ -38,17 +38,6 @@ install() {
     local _i
     dracut_install dmraid partx kpartx
 
-    inst  dmeventd
-
-    for _i in {"$libdir","$usrlibdir"}/libdmraid-events*.so; do
-        [ -e "$_i" ] && dracut_install "$_i"
-    done
-
-    inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
-    # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
-    # files, but provides the one below:
-    inst_rules 64-device-mapper.rules
-
     inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 
     if [ ! -x /lib/udev/vol_id ]; then
@@ -58,6 +47,4 @@ install() {
     inst_rules "$moddir/61-dmraid-imsm.rules"
     inst "$moddir/dmraid-cleanup.sh" /sbin/dmraid-cleanup
     inst_hook pre-trigger 30 "$moddir/parse-dm.sh"
-
 }
-