[readonly/geninitrd/BUSYBOX: 6/113] - fixed scsi modules order (by inglod)

[draenog]

commit 218614aa6ece03ffd84493ef71dd66c7cccda5f3
Author: Jacek Konieczny <jajcus at pld-linux.org>
Date:   Tue Nov 14 14:57:57 2000 +0000

    - fixed scsi modules order (by inglod)
    
    
    svn-id: @1158

 geninitrd | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index 30a8c89..ba8bd5d 100755
--- a/geninitrd
+++ b/geninitrd
@@ -43,7 +43,7 @@ if [ `uname -m` = "ia64" ]; then
 else
   IMAGESIZE=1500
 fi
-PRESCSIMODS="scsi_mod sd_mod unknown"
+PRESCSIMODS="scsi_mod unknown sd_mod"
 PREIDEMODS="ide-mod ide-probe-mod ide-disk"
 fstab="/etc/fstab"
 
@@ -258,20 +258,23 @@ rootdev=$(awk '{ if ($2 == "/") { print $1; }}' $fstab)
 if is_yes "$PROBESCSI" && echo "$rootdev" | grep -q "^/dev/sd" ; then
 
     for n in $PRESCSIMODS; do
+	if [ "$n" = "unknown" ] ; then
+    		if [ ! -f $modulefile ]; then
+        		modulefile=/etc/conf.modules
+    		fi
+    		if [ -f $modulefile ]; then
+			scsimodules=`grep scsi_hostadapter $modulefile | grep -v '^[ 	]*#' | LC_ALL=C sort -u | awk '{ print $3 }'`
+			for n in $scsimodules; do
+    		# for now allow scsi modules to come from anywhere.  There are some
+    		# RAID controllers with drivers in block/
+	    		findmodule "" $n
+			done
+    		fi
+	else
 	    findmodule scsi $n
+	fi
     done
 
-    if [ ! -f $modulefile ]; then
-        modulefile=/etc/conf.modules
-    fi
-    if [ -f $modulefile ]; then
-	scsimodules=`grep scsi_hostadapter $modulefile | grep -v '^[ 	]*#' | LC_ALL=C sort -u | awk '{ print $3 }'`
-	for n in $scsimodules; do
-    # for now allow scsi modules to come from anywhere.  There are some
-    # RAID controllers with drivers in block/
-	    findmodule "" $n
-	done
-    fi
 fi
 
 if is_yes "$PROBEIDE" && echo "$rootdev" | grep -q "^/dev/hd" ; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/0999a53e93eedcf489380684b998ce04aaddf11c