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

Kleiner netter neuer Versuch.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@352 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-11-28 21:27:53 +00:00
parent 9607771add
commit 02c629b9ff
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/pxe
View File

@@ -58,6 +58,7 @@ $(TARGET) :
-e "s|instroot|$(VERSION)/instroot|" \ -e "s|instroot|$(VERSION)/instroot|" \
/install/cdrom/boot/isolinux/isolinux.cfg \ /install/cdrom/boot/isolinux/isolinux.cfg \
> /tmp/pxelinux.cfg/$(SNAME)-pxe-$(VERSION).model > /tmp/pxelinux.cfg/$(SNAME)-pxe-$(VERSION).model
ln -s $(SNAME)-pxe-$(VERSION).model /tmp/pxelinux.cfg/default
chmod 444 /tmp/$(VERSION)/instroot.gz chmod 444 /tmp/$(VERSION)/instroot.gz
cd /tmp && tar cvzf \ cd /tmp && tar cvzf \
/install/images/$(SNAME)-$(VERSION)-pxe-$(MACHINE).tgz * /install/images/$(SNAME)-$(VERSION)-pxe-$(MACHINE).tgz *

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

@@ -7,8 +7,6 @@
* Contains stuff related to firing up the network card, including a crude * Contains stuff related to firing up the network card, including a crude
* autodector. * autodector.
* *
* $Id: nic.c,v 1.8.2.1 2004/04/14 22:05:40 gespinasse Exp $
*
*/ */
#include "install.h" #include "install.h"
@@ -34,6 +32,8 @@ int networkmenu(struct keyvalue *ethernetkv)
char commandstring[STRING_SIZE]; char commandstring[STRING_SIZE];
char address[STRING_SIZE], netmask[STRING_SIZE]; char address[STRING_SIZE], netmask[STRING_SIZE];
int done; int done;
FILE *handle;
char line[STRING_SIZE];
char description[1000]; char description[1000];
char message[1000]; char message[1000];
char title[STRING_SIZE]; char title[STRING_SIZE];
@@ -46,28 +46,34 @@ int networkmenu(struct keyvalue *ethernetkv)
if (rc == 0 || rc == 1) if (rc == 0 || rc == 1)
{ {
probecards(driver, driveroptions); sprintf(commandstring, "/bin/probenic.sh 1");
if (!strlen(driver)) sprintf(message, ctr[TR_PROBING_FOR_NICS]);
errorbox(ctr[TR_PROBE_FAILED]); runcommandwithstatus(commandstring, message);
else
if ((handle = fopen("/nicdriver", "r")))
{ {
findnicdescription(driver, description); char *driver;
sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN); fgets(line, STRING_SIZE-1, handle);
sprintf(message, ctr[TR_FOUND_NIC], NAME, description); fclose(handle);
newtWinMessage(title, ctr[TR_OK], message); line[strlen(line) - 1] = 0;
} driver = strtok(line, ".");
} fprintf(flog, "Detected NIC driver: %s\n",driver);
if (strlen(driver) > 1) {
strcpy(driveroptions, "");
findnicdescription(driver, description);
sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
sprintf(message, ctr[TR_FOUND_NIC], NAME, description);
newtWinMessage(title, ctr[TR_OK], message);
} else {
errorbox(ctr[TR_PROBE_FAILED]);
}
}
}
else if (rc == 2) else if (rc == 2)
choosecards(driver, driveroptions); choosecards(driver, driveroptions);
else else
done = 1;
if (strlen(driver))
done = 1; done = 1;
} }
if (!strlen(driver))
goto EXIT;
/* Default is a GREEN nic only. */ /* Default is a GREEN nic only. */
/* Smoothie is not untarred yet, so we have to delay actually writing the /* Smoothie is not untarred yet, so we have to delay actually writing the