]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
dracut-functions.sh: do not force require modules.builtin*
authorHarald Hoyer <harald@redhat.com>
Thu, 5 Dec 2013 14:06:06 +0000 (15:06 +0100)
committerHarald Hoyer <harald@redhat.com>
Thu, 5 Dec 2013 14:13:29 +0000 (15:13 +0100)
dracut-functions.sh
dracut.sh

index 2872516aacf71ca32faee8152190d4d1c00efdc1..04f4fea041d7502f192ca4e133cb3439a085e3d8 100755 (executable)
@@ -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
index 6975d90ea6fbcf313109f4b806f891ee7a5610cb..5709874d2ee00c16105e1c656cc03fcf601bd60e 100755 (executable)
--- 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