installer: remove useless deepscan.

diff --git a/lfs/installer b/lfs/installer
index 76619630de10e80682e3864852412b056514e269..740793a04ac2aea846b8c301c40be9e7d3852536 100644 (file)
--- a/lfs/installer
+++ b/lfs/installer
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -61,7 +61,7 @@ $(TARGET) :
            -DNAME='\"$(NAME)\"' -DSNAME='\"$(SNAME)\"' -DVERSION='\"$(VERSION)\"' \
             -DSLOGAN='\"$(SLOGAN)\"' -DCONFIG_ROOT='\"$(CONFIG_ROOT)\"' -DKERNEL_VERSION='\"$(KVER)\"'"
        cd $(DIR_APP)/install && install -v -m 0755 install probenic.sh \
-               probehw.sh downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin
+               downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin
        #Patch ISO Name for download ...
        sed -i -e "s|ipfire.iso|download.ipfire.org/releases/ipfire-2.x/$(VERSION)-core$(CORE)/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso|g" \
                                /install/initrd/bin/downloadsource.sh

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 319dfded7ea8c1489b736d9a00feef7788bcac19..9513a7f1fbb518cc95a4524a9fa8ec840bffb541 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -57,7 +57,6 @@ int main(int argc, char *argv[])
        int choice;
        int i;
        int found = 0;
-       int firstrun = 0;
        char shortlangname[10];
        char message[1000];
        char title[STRING_SIZE];
@@ -203,13 +202,8 @@ int main(int argc, char *argv[])
                                found = 1;
                                break;
                        case 10: // No harddisk found
-                               if (firstrun == 1) {
-                                       errorbox(ctr[TR_NO_HARDDISK]);
-                                       goto EXIT;
-                               }
-                               // Do this if the kudzu-scan fails...
-                               runcommandwithstatus("/bin/probehw.sh deep-scan", ctr[TR_PROBING_HARDWARE]);
-                               firstrun = 1;
+                               errorbox(ctr[TR_NO_HARDDISK]);
+                               goto EXIT;
                }
        }
 

diff --git a/src/install+setup/install/probehw.sh b/src/install+setup/install/probehw.sh
deleted file mode 100644 (file)
index c56462e..0000000
--- a/src/install+setup/install/probehw.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/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" ] || \
-                               [ "${MODULE}" = "" ]; then
-        continue
-               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
-
-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/ata && 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