Setup SegFault-Fix.

[people/teissler/ipfire-2.x.git] / src / install+setup / install / probehw.sh

diff --git a/src/install+setup/install/probehw.sh b/src/install+setup/install/probehw.sh
index 84b7fd7633057ff44af92dc1eaa104fd83e7bb01..6ca3e37db4f167ceb78dff883d9fdbe563a60667 100644 (file)
--- a/src/install+setup/install/probehw.sh
+++ b/src/install+setup/install/probehw.sh
@@ -1,17 +1,57 @@
 #!/bin/sh
 
-echo "Detecting Hardware"
-for MODULE in $(kudzu -qps  -t 30 | grep driver | cut -d ' ' -f 2 | sort | uniq); do
-    if [ "${MODULE}" = "unknown" ] || \
-        [ "${MODULE}" = "ignore" ]; then
+echo "Detecting Hardware..."
+for MODULE in $(kudzu -qps  -t 30 | grep driver: | cut -d ' ' -f 2 | sort | uniq); do
+               if [ "${MODULE}" = "unknown" ] || \
+                               [ "${MODULE}" = "ignore" ] || \
+                               [ "${MODULE}" = "" ]; then
         continue
-    fi
-    if grep -Eqe "^${MODULE} " /proc/modules; then
-        continue
-    fi
-    echo "Loading ${MODULE}"
-    modprobe -k ${MODULE}
-    udevstart
+               fi
+               echo -n "Module: $MODULE --> "
+               MODULE=$(basename $(find /lib/modules -name $(echo $MODULE | sed -e 's/[_-]/*/g')* ) | cut -d. -f1 | head -1)
+               echo "$MODULE"
+    
+               if grep -Eqe "^${MODULE} " /proc/modules; then
+                       continue
+               fi
+               echo -n "Loading ${MODULE}"
+               modprobe ${MODULE} >/dev/null 2>&1
+               echo " --> ecode: $?"
+done
+
+sleep 10
+
+if [ $# -eq 0 ]; then
+       exit 0
+fi
+
+## If the autodetection fails we will try to load every module...
+## Do this only when we want...
+
+for i in a b c d e f g; do
+       if [ ! -e /dev/sd$i ]; then
+               DEVICE="/dev/sd$i"
+               echo "Checking for: $DEVICE"
+               break
+       fi
 done
 
+for MODULE in $(ls /lib/modules/*/kernel/drivers/scsi); do
+       MODULE=`basename $MODULE | awk -F. '{ print $1 }'`
+       
+       echo -n "Probing for $MODULE"
+       modprobe $MODULE >/dev/null 2>&1
+       RETVAL=$?
+       echo " --> ecode: $RETVAL"
+       if [ "$RETVAL" -eq "0" ]; then
+               sleep 3
+               if [ -e "$DEVICE" ]; then
+                       break
+               fi
+       fi
+
+done
+
+sleep 5
+
 exit 0