From: Warren Togami <wtogami@redhat.com>
Date: Thu, 28 May 2009 19:55:44 +0000 (-0400)
Subject: $drivers specified from .conf or --drivers get copied once, instead of multiple times... 
X-Git-Tag: 0.1~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba126e82af0c1b8a7236da8ba38c49789dda758c;p=thirdparty%2Fdracut.git

$drivers specified from .conf or --drivers get copied once, instead of multiple times with other calls to instmods()
---

diff --git a/modules.d/40network/install b/modules.d/40network/install
index e0ac5f58e..d9ec7f045 100755
--- a/modules.d/40network/install
+++ b/modules.d/40network/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 dracut_install ip dhclient hostname
-instmods ${drivers:-=net}
+instmods =net
 inst "$moddir/ifup" "/sbin/ifup"
 inst "$moddir/dhclient-script" "/sbin/dhclient-script"
 instmods =networking ecb arc4
diff --git a/modules.d/90kernel-modules/install b/modules.d/90kernel-modules/install
index 41504357d..4c4eae755 100755
--- a/modules.d/90kernel-modules/install
+++ b/modules.d/90kernel-modules/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 # FIXME: hard-coded module list of doom.
-instmods ${drivers:-=ata =block sd_mod =fs}
+instmods =ata =block sd_mod =fs
 
 # Grab modules for all filesystem types we currently have mounted
 while read d mp t rest; do
diff --git a/modules.d/99base/install b/modules.d/99base/install
index a99f6abf2..27b07a431 100755
--- a/modules.d/99base/install
+++ b/modules.d/99base/install
@@ -14,3 +14,5 @@ fi
 inst "$moddir/switch_root" "/sbin/switch_root"
 inst "$moddir/dracut-lib" "/lib/dracut-lib"
 inst_hook pre-pivot 50 "$moddir/selinux-loadpolicy.sh"
+# Install any drivers specified from .conf or --drivers
+instmods ${drivers}