bye bye iscsi_wait_scan ... officially gone for kernel 3.6

diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
index 324e0627fcd25738f2f32d873a5480b847eb47ed..48ad0e62344f9c37d4209315409edc396b8993c7 100755 (executable)
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -32,8 +32,6 @@ mount_boot()
                     udevadm settle --timeout=30
                 fi
                 [ -e $boot ] && break
-                modprobe scsi_wait_scan && rmmod scsi_wait_scan
-                [ -e $boot ] && break
                 sleep 0.5
                 i=$(($i+1))
                 [ $i -gt 40 ] && break

diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
index 103a4795239183fac6e01d8da3f1c94dc79e45c6..6b3e444b246eccae30e65cd62c905d8bf1bc55fd 100755 (executable)
--- a/modules.d/01fips/module-setup.sh
+++ b/modules.d/01fips/module-setup.sh
@@ -24,7 +24,6 @@ installkernel() {
             echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
         fi
     done
-    hostonly='' instmods scsi_wait_scan
 }
 
 install() {

diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
index 773e4cd2048f70af6af9ce338619317be078bf73..e9da432b0fed0d67b5615a4a77d402d2258e0f0c 100755 (executable)
--- a/modules.d/98systemd/dracut-initqueue.sh
+++ b/modules.d/98systemd/dracut-initqueue.sh
@@ -25,7 +25,6 @@ while :; do
     check_finished && break
 
     udevsettle
-    modprobe -q scsi_wait_scan && modprobe -q -r scsi_wait_scan
 
     check_finished && break
 

diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
index 4c5a2f88d6b5a40b117d176362da2277841f068a..16c8958ca0c28840131604c52af24ccd1d7e5214 100755 (executable)
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
@@ -156,7 +156,6 @@ while :; do
     check_finished && break
 
     udevsettle
-    modprobe -q scsi_wait_scan && modprobe -q -r scsi_wait_scan
 
     check_finished && break