Timeout here is not a good idea. rootfs cannot be mounted and kernel oopses due to...

[projects/geninitrd.git] / mod-scsi.sh

diff --git a/mod-scsi.sh b/mod-scsi.sh
index 288f0d91b58fece8a3d3fe7d19376074da9f45e9..12724efe22be017b9a8fc8e29375783f06ae8a84 100644 (file)
--- a/mod-scsi.sh
+++ b/mod-scsi.sh
@@ -1,6 +1,4 @@
 #!/bin/sh
-RCSID='$Revision$ $Date::                            $'
-
 # geninitrd mod: scsi
 
 # it should be safe to remove scsi_mod from here, but I'm not sure...
@@ -23,7 +21,7 @@ is_scsi() {
        fi
 
        # TODO: more sophisticated check, not just pathname check
-       if is_yes "$(echo "$node" | awk '/^\/dev\/(sd|scsi)/ { print "yes"; }')"; then
+       if is_yes "$(echo "$node" | awk '/^\/dev\/(sd|scsi|vd)/ { print "yes"; }')"; then
                return 0
        fi
 
@@ -39,8 +37,8 @@ find_modules_scsi() {
        local n
        for n in $PRESCSIMODS; do
                if [ "X$n" = "Xunknown" ]; then
-                       debug "Finding SCSI modules using scsi_hostadapter"
-                       local mod scsimodules=$(modprobe_conf | awk '/scsi_hostadapter/ && ! /^[\t ]*#/ { print $3; }')
+                       verbose "Finding SCSI modules using scsi_hostadapter"
+                       local mod scsimodules=$(modprobe_conf | awk '/scsi_hostadapter/ { print $3 }')
                        for mod in $scsimodules; do
                                # for now allow scsi modules to come from anywhere. There are some
                                # RAID controllers with drivers in block