2 Buildfixes

[people/pmueller/ipfire-2.x.git] / src / install+setup / install / probecntrl.sh

diff --git a/src/install+setup/install/probecntrl.sh b/src/install+setup/install/probecntrl.sh
index 6515fada4e43fe982497869d688ac6a66bf4a595..5c58a39102e9400f1421b80c96a36757e22204b4 100644 (file)
--- a/src/install+setup/install/probecntrl.sh
+++ b/src/install+setup/install/probecntrl.sh
@@ -1,13 +1,19 @@
 #!/bin/sh
 
-echo "Probing for SCSI controllers"
-MODULE=`/bin/kudzu -qps  -t 30 -c SCSI | grep driver | cut -d ' ' -f 2 | sort | uniq`
+echo "Probing for storage controllers"
+for MODULE in $(hwinfo --usb --usb-ctrl --storage-ctrl | grep modprobe | awk '{ print $5 }' | tr -d \" | sort | uniq); do
+    if [ "${MODULE}" = "piix" ]; then
+        continue
+    fi
+    if grep -Eqe "^${MODULE} " /proc/modules; then
+        MODULES="${MODULES} --with=${MODULE}"
+        echo "Found: ${MODULE}"
+    fi
+done
 
-if [ "$MODULE" ]; then
-       echo $MODULE > /tmp/cntrldriver
-       echo "Your controller is: $MODULE"
+if [ -z "${MODULES}" ]; then
+       exit 1
+else
+       echo "${MODULES}" > /tmp/cntrldriver
        exit 0
 fi
-
-echo "No SCSI controller found"
-exit 1