$drivers specified from .conf or --drivers get copied once, instead of multiple times...

diff --git a/modules.d/40network/install b/modules.d/40network/install
index e0ac5f58e2190ccb1b524284fb0aa72aaa66714e..d9ec7f0453614eaf3f6a6b48cafc4ba7ec304f87 100755 (executable)
--- 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 41504357d7646c6d99a054d304d71ed41076d422..4c4eae755e2a5bc7b15fc57f991313e7730b271f 100755 (executable)
--- 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 a99f6abf24e318a574ef02a97db889ea00aa36fe..27b07a4316f940b904a7513d6e3a4d0d83971f08 100755 (executable)
--- 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}