From 3e1d0df9e18f7b8c66aaad5b847cbe5dbf21640e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Mon, 8 Mar 2010 11:00:08 +0000
Subject: [PATCH] scan=sync for scsi_mod on >= 2.6.30 (from Ti)

svn-id: @11228
---
 geninitrd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/geninitrd b/geninitrd
index 87f5cf7..0fed0b6 100755
--- a/geninitrd
+++ b/geninitrd
@@ -618,6 +618,10 @@ modules_add_linuxrc() {
 		local usleep=$(eval echo \$MODULE_${genericname}_USLEEP)
 		local firmware=$(eval echo \$MODULE_${genericname}_FIRMWARE)
 
+		if [ "$module" = "scsi_mod" -a "$kernel_version_long" -ge "002006030" ]; then
+			options="scan=sync $options"
+		fi
+
 		if [ -n "$verbose" ]; then
 			s=""
 			if [ "$options" ]; then
@@ -648,10 +652,6 @@ modules_add_linuxrc() {
 			if [ "$(busybox_applet rmmod 2>/dev/null; echo $?)" = 0 ]; then
 				echo "rmmod scsi_wait_scan" | add_linuxrc
 			fi
-			# HACK HACK HACK until we get proper solution like waiting untill rootfs device appears
-			if [ -z "$usleep" -a "$kernel_version_long" -ge "002006030" ]; then
-				echo "usleep 15000000" | add_linuxrc
-			fi
 		fi
 
 	done
-- 
2.44.0