From: Harald Hoyer <harald@redhat.com>
Date: Wed, 9 Nov 2011 13:24:59 +0000 (+0100)
Subject: lvm, dm, dmraid: cleanup, which module installs what
X-Git-Tag: 014~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=760dcc6a6507cc4da179e20add4fb348718075ef;p=thirdparty%2Fdracut.git

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 e7c813de2..a55d59177 100755
--- 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 8c664974a..87a4d1efe 100755
--- 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 e5ef94e68..40dc35095 100755
--- 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