From: Harald Hoyer <harald@redhat.com>
Date: Thu, 6 Oct 2011 08:25:08 +0000 (+0200)
Subject: 95udev-rules/module-setup.sh: also search in /lib/udev and /usr/lib/udev
X-Git-Tag: 014~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0f9ecc6a47bb01de04e6b44ade38f347fe057da;p=thirdparty%2Fdracut.git

95udev-rules/module-setup.sh: also search in /lib/udev and /usr/lib/udev
---

diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index 876f7a3ff..eddf2b030 100755
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -7,7 +7,9 @@ install() {
     # FIXME: would be nice if we didn't have to know which rules to grab....
     # ultimately, /lib/initramfs/rules.d or somesuch which includes links/copies
     # of the rules we want so that we just copy those in would be best
-    dracut_install udevd udevadm
+    dracut_install udevadm
+    [ -x /sbin/udevd ] && dracut_install udevd
+
     for i in /etc/udev/udev.conf /etc/group; do
         inst_simple $i
     done
@@ -55,10 +57,15 @@ install() {
         vol_id \
         pcmcia-socket-startup \
         pcmcia-check-broken-cis \
+        udevd \
         ; do
         [ -e /lib/udev/$_i ] && dracut_install /lib/udev/$_i
+        [ -e /usr/lib/udev/$_i ] && dracut_install /usr/lib/udev/$_i
     done
 
+    [ -x /lib/udev/udevd ] && ln -s ../lib/udev/udevd /sbin/udevd
+    [ -x /usr/lib/udev/udevd ] && ln -s ../usr/lib/udev/udevd /sbin/udevd
+
     [ -f /etc/arch-release ] && \
         inst "$moddir/load-modules.sh" /lib/udev/load-modules.sh