Installer: check md5 of downloaded iso.

[people/pmueller/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 b56cde02b891ef89f76f8793b761b5fa205f8639..c56462ee1dd0521e8f08397ca3131ed940edeeba 100644 (file)
--- a/src/install+setup/install/probehw.sh
+++ b/src/install+setup/install/probehw.sh
@@ -1,16 +1,40 @@
 #!/bin/sh
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 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
+               if [ "${MODULE}" = "unknown" ] || \
+                               [ "${MODULE}" = "ignore" ] || \
+                               [ "${MODULE}" = "" ]; then
         continue
-    fi
-    if grep -Eqe "^${MODULE} " /proc/modules; then
-        continue
-    fi
-    echo -n "Loading ${MODULE}"
-    modprobe ${MODULE} >/dev/null 2>&1
+               fi
+               MODULE=$(find /lib/modules -name $(echo $MODULE | sed -e 's/[_-]/*/g')* 2>/dev/null)
+    [ "${MODULE}" == "" ] && continue
+    MODULE=$(basename $MODULE | cut -d. -f1 | head -1)
+    
+               if grep -Eqe "^${MODULE} " /proc/modules; then
+                       continue
+               fi
+               echo -n "Loading ${MODULE}"
+               modprobe ${MODULE} >/dev/null 2>&1
                echo " --> ecode: $?"
 done
 
@@ -31,7 +55,7 @@ for i in a b c d e f g; do
        fi
 done
 
-for MODULE in $(ls /lib/modules/*/kernel/drivers/scsi); do
+for MODULE in $(ls /lib/modules/*/kernel/drivers/ata && ls /lib/modules/*/kernel/drivers/scsi); do
        MODULE=`basename $MODULE | awk -F. '{ print $1 }'`
        
        echo -n "Probing for $MODULE"