From d0f2cc42619ae82fb4538ddcf81bc3636aab8962 Mon Sep 17 00:00:00 2001
From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Mon, 20 Aug 2007 09:01:12 +0000
Subject: [PATCH] Setup SegFault-Fix.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@788 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 src/install+setup/install/probehw.sh | 21 ++++++++++++---------
 src/install+setup/setup/networking.c |  8 +++++---
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/install+setup/install/probehw.sh b/src/install+setup/install/probehw.sh
index ff4320aff1..6ca3e37db4 100644
--- a/src/install+setup/install/probehw.sh
+++ b/src/install+setup/install/probehw.sh
@@ -2,17 +2,20 @@
 
 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
-    MODULE=$(basename $(find /lib/modules -name $(echo $MODULE | sed -e 's/[_-]/*/g')* ) | cut -d. -f1 | head -1)
+		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
+		if grep -Eqe "^${MODULE} " /proc/modules; then
+			continue
+		fi
+		echo -n "Loading ${MODULE}"
+		modprobe ${MODULE} >/dev/null 2>&1
 		echo " --> ecode: $?"
 done
 
diff --git a/src/install+setup/setup/networking.c b/src/install+setup/setup/networking.c
index 740f352f4a..351902a14e 100644
--- a/src/install+setup/setup/networking.c
+++ b/src/install+setup/setup/networking.c
@@ -245,10 +245,12 @@ int firstmenu(void)
 	if (netaddresschange) 
 		strcpy(networkrestart, ctr[TR_RESTART_REQUIRED]);
 
-	strcpy(temp, ""); findkey(kv, "CONFIG_TYPE", temp); x = atol(temp);
-	if (x < 1 || x > 4) x = 0;
+	strcpy(temp, ""); findkey(kv, "CONFIG_TYPE", temp); 
+	x = atol(temp);
+	x--;
+	if (x < 1 || x > 4) x = 1;
 	/* Format heading bit. */
-	snprintf(message, 1000, ctr[TR_CURRENT_CONFIG], configtypenames[x-1],
+	snprintf(message, 1000, ctr[TR_CURRENT_CONFIG], configtypenames[x],
 		networkrestart);
 	rc = newtWinMenu(ctr[TR_NETWORK_CONFIGURATION_MENU], message, 50, 5, 5, 6,
 			sections, &choice, ctr[TR_OK], ctr[TR_DONE], NULL);
-- 
2.39.2