removed scsi_wait_scan from standard install
authorHarald Hoyer <harald@redhat.com>
Thu, 31 May 2012 07:14:17 +0000 (09:14 +0200)
committerHarald Hoyer <harald@redhat.com>
Thu, 31 May 2012 07:14:17 +0000 (09:14 +0200)
modules.d/01fips/module-setup.sh
modules.d/90kernel-modules/module-setup.sh

index 6bfe31e..075fc24 100755 (executable)
@@ -19,11 +19,12 @@ installkernel() {
     mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
 
     for _mod in $_fipsmodules; do
-        if instmods $_mod; then
+        if hostonly='' instmods $_mod; then
             echo $_mod >> "${initdir}/etc/fipsmodules"
             echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
         fi
     done
+    hostonly='' instmods scsi_wait_scan
 }
 
 install() {
index f4832c4..4df180b 100755 (executable)
@@ -68,9 +68,6 @@ installkernel() {
         hostonly='' instmods -c $filesystems || return 1
     fi
 
-    # force install of scsi_wait_scan
-    hostonly='' instmods scsi_wait_scan
-
     for _f in modules.builtin.bin modules.builtin; do
         [[ $srcmods/$_f ]] && break
     done || {