Blame SOURCES/0210-dracut-functions.sh-do-not-force-require-modules.bui.patch

a56a5e
From 52923f5f2a3890449d59aa8a251f9116ab260e7f Mon Sep 17 00:00:00 2001
a56a5e
From: Harald Hoyer <harald@redhat.com>
a56a5e
Date: Thu, 5 Dec 2013 15:06:06 +0100
a56a5e
Subject: [PATCH] dracut-functions.sh: do not force require modules.builtin*
a56a5e
a56a5e
(cherry picked from commit b29cb51654db13706c7356aa827e554456b25b0a)
a56a5e
---
a56a5e
 dracut-functions.sh | 7 -------
a56a5e
 dracut.sh           | 2 +-
a56a5e
 2 files changed, 1 insertion(+), 8 deletions(-)
a56a5e
a56a5e
diff --git a/dracut-functions.sh b/dracut-functions.sh
a56a5e
index 0002556..8a0cd30 100755
a56a5e
--- a/dracut-functions.sh
a56a5e
+++ b/dracut-functions.sh
a56a5e
@@ -1455,13 +1455,6 @@ dracut_kernel_post() {
a56a5e
         wait $_pid
a56a5e
     fi
a56a5e
 
a56a5e
-    for _f in modules.builtin.bin modules.builtin; do
a56a5e
-        [[ $srcmods/$_f ]] && break
a56a5e
-    done || {
a56a5e
-        dfatal "No modules.builtin.bin and modules.builtin found!"
a56a5e
-        return 1
a56a5e
-    }
a56a5e
-
a56a5e
     for _f in modules.builtin.bin modules.builtin modules.order; do
a56a5e
         [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
a56a5e
     done
a56a5e
diff --git a/dracut.sh b/dracut.sh
a56a5e
index 7d5c9e0..f560dd1 100755
a56a5e
--- a/dracut.sh
a56a5e
+++ b/dracut.sh
a56a5e
@@ -518,7 +518,7 @@ if [[ $regenerate_all == "yes" ]]; then
a56a5e
 
a56a5e
     cd /lib/modules
a56a5e
     for i in *; do
a56a5e
-        [[ -f $i/modules.builtin ]] || continue
a56a5e
+        [[ -f $i/modules.dep ]] || [[ -f $i/modules.dep.bin ]] || continue
a56a5e
         dracut --kver="$i" "${dracut_args[@]}"
a56a5e
         ((ret+=$?))
a56a5e
     done