From: Harald Hoyer <harald@redhat.com>
Date: Mon, 23 Jul 2012 09:38:36 +0000 (+0200)
Subject: kernel-modules/module-setup.sh: fix modprobe.d install
X-Git-Tag: 023~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7c8f59fef3a2a36726f5ea988b74ba6bf1da695;p=thirdparty%2Fdracut.git

kernel-modules/module-setup.sh: fix modprobe.d install

if /lib/modprobe.d does not exist, it errors with:
find: `/lib/modprobe.d/': No such file or directory
---

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index f309de8b1..5391ed79a 100755
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -77,7 +77,10 @@ installkernel() {
 install() {
     local _f i
     [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
-    dracut_install $(find -L /{etc,lib}/modprobe.d/ -maxdepth 1 -type f -name '*.conf')
+    set -- /{etc,lib}/modprobe.d/*.conf
+    if [[ -f $1 ]]; then
+        dracut_install "$@"
+    fi
     inst_hook cmdline 01 "$moddir/parse-kernel.sh"
     inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
 }