scan=sync for scsi_mod on >= 2.6.30 (from Ti)

svn-id: @11228

diff --git a/geninitrd b/geninitrd
index 87f5cf75d330c807cacbe2ed08fcad0fcb48868d..0fed0b6b4b28fd600d7ac1a830838bfd4fa93a41 100755 (executable)
--- 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