From: Harald Hoyer <harald@redhat.com>
Date: Wed, 25 Nov 2009 18:59:30 +0000 (+0100)
Subject: lvm/dmraid: make LIBDIR depend on the binary
X-Git-Tag: 003~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bad6113059a6726b76b717c8df18c5a4ae8f7110;p=thirdparty%2Fdracut.git

lvm/dmraid: make LIBDIR depend on the binary
---

diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index 043185048..a016e4d21 100755
--- a/modules.d/90dmraid/install
+++ b/modules.d/90dmraid/install
@@ -3,7 +3,13 @@ dracut_install dmraid partx kpartx
 
 inst  dmeventd
 
-for i in $(ls /usr/lib*/libdmraid-events*.so /lib*/libdmraid-events*.so); do
+if ldd $(which dmraid) | grep -q lib64; then
+    LIBDIR="/lib64"
+else
+    LIBDIR="/lib"
+fi
+
+for i in $(ls /{usr,}/$LIBDIR/libdmraid-events*.so 2>/dev/null); do
     dracut_install $i
 done
 
diff --git a/modules.d/90lvm/install b/modules.d/90lvm/install
index 3ff435256..56e2eb067 100755
--- a/modules.d/90lvm/install
+++ b/modules.d/90lvm/install
@@ -2,13 +2,19 @@
 inst lvm
 inst dmeventd
 
+if ldd $(which lvm) | grep -q lib64; then
+    LIBDIR="/lib64"
+else
+    LIBDIR="/lib"
+fi
+
 inst_rules "$moddir/64-lvm.rules" 64-lvm.rules
 
 if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then 
     [ -f /etc/lvm/lvm.conf ] && inst /etc/lvm/lvm.conf
 fi
 
-for i in $(ls /lib*/libdevmapper-event*.so); do 
+for i in $(ls /$LIBDIR/libdevmapper-event*.so 2>/dev/null); do 
     dracut_install $i
 done