lvm, dm, dmraid: cleanup, which module installs what

The dm module, which lvm and dmraid depend on, installed dmraid
shared libs. The lvm module installed udev rules, which were
already installed by the dm module.
Cleaned up those issues.

diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh
index e7c813de23f2ad9698d8fa87d65233d75fb5550b..a55d5917755b09117ac3e9985a08c96408ac7e2a 100755 (executable)
--- a/modules.d/90dm/module-setup.sh
+++ b/modules.d/90dm/module-setup.sh
@@ -22,7 +22,7 @@ install() {
 
     type -P dmeventd >/dev/null && dracut_install dmeventd
 
-    for _i in {"$libdir","$usrlibdir"}/libdmraid-events*.so; do
+    for _i in {"$libdir","$usrlibdir"}/libdevmapper-event.so*; do
         [ -e "$_i" ] && dracut_install "$_i"
     done
 

diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh
index 8c664974a0d3e9f1df420151d7ec93c9b3ed2719..87a4d1efe309b27cae3aec70215fc436575e0cc1 100755 (executable)
--- a/modules.d/90dmraid/module-setup.sh
+++ b/modules.d/90dmraid/module-setup.sh
@@ -44,6 +44,10 @@ install() {
         inst_rules 64-md-raid.rules
     fi
 
+    for _i in {"$libdir","$usrlibdir"}/libdmraid-events*.so*; do
+        [ -e "$_i" ] && dracut_install "$_i"
+    done
+
     inst_rules "$moddir/61-dmraid-imsm.rules"
     #inst "$moddir/dmraid-cleanup.sh" /sbin/dmraid-cleanup
     inst_hook pre-trigger 30 "$moddir/parse-dm.sh"

diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
index e5ef94e6817f82052cf94bbcdd551def62ae094a..40dc35095328eceb0fbb4fef38efcc9a15ee6b39 100755 (executable)
--- a/modules.d/90lvm/module-setup.sh
+++ b/modules.d/90lvm/module-setup.sh
@@ -48,7 +48,7 @@ install() {
         fi
     fi
 
-    inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 11-dm-lvm.rules
+    inst_rules 11-dm-lvm.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