From: Harald Hoyer <harald@redhat.com>
Date: Wed, 22 Feb 2012 10:49:47 +0000 (+0100)
Subject: 90kernel-modules/module-setup.sh: install modules.* in installkernel()
X-Git-Tag: 017~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6e244f7948e0eef8f2c451901479cd071fc5778;p=thirdparty%2Fdracut.git

90kernel-modules/module-setup.sh: install modules.* in installkernel()

modules.* should be in the kernel initramfs
---

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index d0ead73c3..fa4be0671 100755
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -63,16 +63,6 @@ installkernel() {
 
     # force install of scsi_wait_scan
     hostonly='' instmods scsi_wait_scan
-}
-
-install() {
-    local _f i
-    [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
-    for i in $(find -L /etc/modprobe.d/ -maxdepth 1 -type f -name '*.conf'); do
-        inst_simple "$i"
-    done
-    inst_hook cmdline 01 "$moddir/parse-kernel.sh"
-    inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
 
     for _f in modules.builtin.bin modules.builtin; do
         [[ $srcmods/$_f ]] && break
@@ -84,4 +74,15 @@ install() {
     for _f in modules.builtin.bin modules.builtin modules.order; do
         [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
     done
+
+}
+
+install() {
+    local _f i
+    [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
+    for i in $(find -L /etc/modprobe.d/ -maxdepth 1 -type f -name '*.conf'); do
+        inst_simple "$i"
+    done
+    inst_hook cmdline 01 "$moddir/parse-kernel.sh"
+    inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
 }