From: Harald Hoyer <harald@redhat.com>
Date: Thu, 11 Aug 2011 09:26:43 +0000 (+0200)
Subject: 90dm: install libdevmapper-event* for 90dm and cleanup 90dmraid
X-Git-Tag: 012~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ec1562355232ee734f94b66445618b26eadf411;p=thirdparty%2Fdracut.git

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 c924ec79e..e7c813de2 100755
--- 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 fa2088022..5d02eb8e8 100755
--- 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"
-
 }
-