From: Amadeusz Żołnowski <aidecoe@aidecoe.name>
Date: Fri, 22 Apr 2011 15:43:11 +0000 (+0200)
Subject: kernel-modules: inst modules.builtin if there's no modules.builtin.bin
X-Git-Tag: 011~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64fcb3cce7a1b549af872297982545485c269232;p=thirdparty%2Fdracut.git

kernel-modules: inst modules.builtin if there's no modules.builtin.bin

Also report failure if none of them exist.
---

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 5f0e4a75c..5764bf505 100755
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -46,5 +46,14 @@ install() {
     dracut_install $(find /etc/modprobe.d/ -type f -name '*.conf')
     inst_hook cmdline 01 "$moddir/parse-kernel.sh"
     inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
-    inst "$srcmods/modules.builtin.bin" "/lib/modules/$kernel/modules.builtin.bin"
+
+    local f
+
+    for f in modules.builtin.bin modules.builtin; do
+        [[ $srcmods/$f ]] && inst "$srcmods/$f" "/lib/modules/$kernel/$f" \
+            && break
+    done || {
+        dfatal "No modules.builtin.bin and modules.builtin found!"
+        return 1
+    }
 }