webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-25 18:32:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Neue Hardwareerkennung im Installer...

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@448 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-03-14 21:57:20 +00:00
parent 76dd79d156
commit 4809e64e27
13 changed files with 70 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/install+setup/install/install.h
View File

@@ -6,8 +6,6 @@
* (c) Lawrence Manning, 2001
* Main include file.
*
* $Id: install.h,v 1.10 2004/02/24 21:24:10 alanh Exp $
*
*/
#include "../libsmooth/libsmooth.h"

6
src/install+setup/install/main.c
View File

@@ -253,10 +253,6 @@ int main(int argc, char *argv[])
fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
} else {
fgets(line, STRING_SIZE, cmdfile);
if (strstr (line, "fdisk") != NULL) {
fprintf(flog, "Manual FDISK selected.\n");
fdisk = 1;
}
if (strstr (line, "nousb") == NULL) {
fprintf(flog, "Initializing USB controllers.\n");
initialize_usb();
@@ -296,10 +292,10 @@ int main(int argc, char *argv[])
newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
newtPushHelpLine(ctr[TR_HELPLINE]);
sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
if (!unattended) {
sprintf(message, ctr[TR_WELCOME], NAME);
sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
newtWinMessage(title, ctr[TR_OK], message);
sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);

8
src/install+setup/install/mountsource.sh
View File

@@ -1,14 +1,10 @@
#!/bin/sh
#
# to be banished by kudzu!
#
echo "Scanning source media"
# scan CDROM devices
for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sort | uniq); do
for DEVICE in $(hwinfo --cdrom | grep "Device File" | awk -F: '{ print $2 }' | cut -c 7- | sort | uniq); do
mount /dev/${DEVICE} /cdrom 2> /dev/null
if [ -e /cdrom/boot ]; then
echo -n ${DEVICE} > /tmp/source_device
@@ -18,7 +14,7 @@ for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | so
done
# scan HD device (usb sticks, etc.)
for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do
for DEVICE in $(hwinfo --usb --disk | grep "Device File" | awk -F: '{ print $2 }' | cut -c 7- | sort | uniq); do
mount /dev/${DEVICE}1 /cdrom 2> /dev/null
if [ -e /cdrom/boot ]; then
echo -n ${DEVICE}1 > /tmp/source_device

2
src/install+setup/install/nic.c
View File

@@ -81,7 +81,7 @@ int networkmenu(struct keyvalue *ethernetkv)
strcpy(address, ""); findkey(ethernetkv, "GREEN_ADDRESS", address);
strcpy(netmask, ""); findkey(ethernetkv, "GREEN_NETMASK", netmask);
snprintf(commandstring, STRING_SIZE, "/bin/ifconfig eth0 %s netmask %s up",
snprintf(commandstring, STRING_SIZE, "/sbin/ifconfig eth0 %s netmask %s up",
address, netmask);
if (mysystem(commandstring))
{

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

@@ -1,11 +1,7 @@
#!/bin/sh
#
# to be banished by kudzu!
#
echo "Detecting Hardware"
for MODULE in $(kudzu -qps -t 30 | grep driver | cut -d ' ' -f 2 | sort | uniq); do
for MODULE in $(hwinfo --all | grep modprobe | awk '{ print $5 }' | tr -d \" | sort | uniq); do
if [ "${MODULE}" = "unknown" ] || \
[ "${MODULE}" = "ignore" ]; then
continue

1
src/install+setup/install/usb.c
View File

@@ -51,6 +51,7 @@ int initialize_usb() {
usbuhci = 1;
mysystem("/sbin/modprobe usbhid");
mysystem("udevstart");
return 0;
}