From: Harald Hoyer <harald@redhat.com>
Date: Tue, 27 Oct 2009 09:28:17 +0000 (+0100)
Subject: 90dmraid,90lvm: device mapper upstream rules got renamed
X-Git-Tag: 003~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15c82415c2b7cabfd8470daf836565ca3da2254f;p=thirdparty%2Fdracut.git

90dmraid,90lvm: device mapper upstream rules got renamed
---

diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index a1d226585..ac88212b0 100755
--- a/modules.d/90dmraid/install
+++ b/modules.d/90dmraid/install
@@ -2,8 +2,8 @@
 dracut_install dmraid partx kpartx 
 
 inst  dmeventd
-inst  /usr/lib*/libdmraid-events-isw.so
-inst_rules 10-dm.rules 12-dm-disk.rules 95-dm-notify.rules 
+inst  /usr/lib*/libdmraid-events*.so
+inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 
 
 inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 
diff --git a/modules.d/90lvm/install b/modules.d/90lvm/install
index 30950272b..825d1fcd5 100755
--- a/modules.d/90lvm/install
+++ b/modules.d/90lvm/install
@@ -8,10 +8,8 @@ if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then
     [ -f /etc/lvm/lvm.conf ] && inst /etc/lvm/lvm.conf
 fi
 
-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 /lib*/libdevmapper-event*.so
+inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 11-dm-lvm.rules
 
 inst "$moddir/lvm_scan.sh" /sbin/lvm_scan
 inst_hook cmdline 30 "$moddir/parse-lvm.sh"