From: Harald Hoyer <harald@redhat.com>
Date: Thu, 5 Dec 2013 14:06:06 +0000 (+0100)
Subject: dracut-functions.sh: do not force require modules.builtin*
X-Git-Tag: 035~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b29cb51654db13706c7356aa827e554456b25b0a;p=thirdparty%2Fdracut.git

dracut-functions.sh: do not force require modules.builtin*
---

diff --git a/dracut-functions.sh b/dracut-functions.sh
index 2872516aa..04f4fea04 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -1456,13 +1456,6 @@ dracut_kernel_post() {
         wait $_pid
     fi
 
-    for _f in modules.builtin.bin modules.builtin; do
-        [[ $srcmods/$_f ]] && break
-    done || {
-        dfatal "No modules.builtin.bin and modules.builtin found!"
-        return 1
-    }
-
     for _f in modules.builtin.bin modules.builtin modules.order; do
         [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
     done
diff --git a/dracut.sh b/dracut.sh
index 6975d90ea..5709874d2 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -501,7 +501,7 @@ if [[ $regenerate_all == "yes" ]]; then
 
     cd /lib/modules
     for i in *; do
-        [[ -f $i/modules.builtin ]] || continue
+        [[ -f $i/modules.dep ]] || [[ -f $i/modules.dep.bin ]] || continue
         dracut --kver="$i" "${dracut_args[@]}"
         ((ret+=$?))
     done