webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 19:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Setup SegFault-Fix.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@788 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-08-20 09:01:12 +00:00
parent 1393a0c8f8
commit d0f2cc4261
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/install+setup/install/probehw.sh
View File

@@ -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

8
src/install+setup/setup/networking.c
View File

@@ -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);