From 2e7b6616814a3706f0c15bc20c7c8303463bcba0 Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Fri, 20 Jan 2012 12:06:41 +0100

Subject: [PATCH] 90kernel-modules/module-setup.sh: install modules.order

Also install modules.order and all modules.builtin*

---

 modules.d/90kernel-modules/module-setup.sh |   11 ++++++-----

 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh

index 257b3bc..7888428 100755

--- a/modules.d/90kernel-modules/module-setup.sh

+++ b/modules.d/90kernel-modules/module-setup.sh

@@ -68,7 +68,7 @@ installkernel() {

 }

 install() {

-    local _f

+    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"

@@ -76,13 +76,14 @@ install() {

     inst_hook cmdline 01 "$moddir/parse-kernel.sh"

     inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh

-    local f

-

     for _f in modules.builtin.bin modules.builtin; do

-        [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f" \

-            && break

+        [[ $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

 }