From 71094bee63aee5eebdfc5c3e89ec60d23d17ca9c Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 9 Sep 2009 11:02:41 +0200
Subject: [PATCH] base/init: add scsi_wait_scan to wait for host adapter scans

---
 modules.d/90kernel-modules/installkernel | 2 +-
 modules.d/99base/init                    | 5 +++++
 modules.d/99base/install                 | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules.d/90kernel-modules/installkernel b/modules.d/90kernel-modules/installkernel
index 08c0c74..92e3301 100755
--- a/modules.d/90kernel-modules/installkernel
+++ b/modules.d/90kernel-modules/installkernel
@@ -18,4 +18,4 @@ else
   instmods $drivers
 fi
 
-
+instmods scsi_wait_scan
diff --git a/modules.d/99base/init b/modules.d/99base/init
index 14505ed..04990a8 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -138,6 +138,11 @@ while :; do
     [ -n "$queuetriggered" ] && continue
 
     if $UDEV_QUEUE_EMPTY >/dev/null 2>&1; then
+
+        modprobe scsi_wait_scan && rmmod scsi_wait_scan
+
+        $UDEV_QUEUE_EMPTY >/dev/null 2>&1 || continue
+
         unset queuetriggered
 	for job in /initqueue-settled/*.sh; do
 	    [ -e "$job" ] || break
diff --git a/modules.d/99base/install b/modules.d/99base/install
index 08ca8f0..f2c1c2b 100755
--- a/modules.d/99base/install
+++ b/modules.d/99base/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 dracut_install mount mknod mkdir modprobe pidof sleep chroot \
-    sed ls flock cp mv dmesg rm ln
+    sed ls flock cp mv dmesg rm ln rmmod
 if [ ! -e "${initdir}/bin/sh" ]; then
     dracut_install bash
     (ln -s bash "${initdir}/bin/sh" || :)
-- 
2.7.4