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

(cherry picked from commit b29cb51654db13706c7356aa827e554456b25b0a)

diff --git a/dracut-functions.sh b/dracut-functions.sh
index 0002556719b29a7ead0a2b195947cccc4f346d67..8a0cd30157511bdaa24c54570fde70d4cbddd031 100755 (executable)
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -1455,13 +1455,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 7d5c9e079bfc493925bd30fec60a5e895e8b4e1e..f560dd1e6f57c3f3f69e7f5a3076bedff2596a8d 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -518,7 +518,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