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

Ich hab mal ein bisschen die Arbeit vom Cuebernommen :D

Browse Source 
Aber trotzdem geht die Routine noch kein bisschen. SegFault :(
Ansonsten: Busyboy erweitert, PCMCIA Support begonnen zu entfernen


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@375 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-01-02 18:40:12 +00:00
parent 15854f82e9
commit b4e381a848
11 changed files with 243 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
#define CDROM_INSTALL 0
#define URL_INSTALL 1
#define DISK_INSTALL 2
#define INST_FILECOUNT 5600
#define INST_FILECOUNT 6600
#define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
int raid_disk = 0;
@@ -288,23 +288,6 @@ int main(int argc, char *argv[])
fprintf(flog, "Manual FDISK selected.\n");
fdisk = 1;
}
if (strstr (line, "nopcmcia") == NULL) {
fprintf(flog, "Initializing PCMCIA controllers.\n");
pcmcia = initialize_pcmcia();
if (pcmcia) {
fprintf (flog, "Detected PCMCIA Controller: %s.\n", pcmcia);
sprintf(commandstring, "/sbin/modprobe %s", pcmcia);
mysystem("/sbin/modprobe pcmcia_core");
mysystem(commandstring);
mysystem("/sbin/modprobe ds");
/* pcmcia netcard drivers are not available from Boot floppy,
* they will be loaded from Drivers floppy later */
} else {
fprintf (flog, "Detected No PCMCIA Controller.\n");
}
} else {
fprintf(flog, "Skipping PCMCIA detection.\n");
}
if (strstr (line, "nousb") == NULL) {
fprintf(flog, "Initializing USB controllers.\n");
initialize_usb();
@@ -697,30 +680,6 @@ int main(int argc, char *argv[])
/* Rename uname */
rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
/* Write PCMCIA Config */
if (pcmcia) {
handle = fopen("/harddisk/etc/modules.conf", "a");
if (handle != NULL) {
fprintf (handle, "# PCMCIA Settings\n");
fprintf (handle, "alias pcmcia-controller %s\n", pcmcia);
fclose(handle);
}
}
handle = fopen("/harddisk/etc/pcmcia.conf", "w");
if (handle != NULL) {
if (pcmcia) {
fprintf (handle, "PCMCIA=yes\n");
fprintf (handle, "PCIC=%s\n", pcmcia);
} else {
fprintf (handle, "PCMCIA=no\n");
fprintf (handle, "PCIC=\n");
}
fprintf (handle, "CARDMGR_OPTS=\n");
fprintf (handle, "SCHEME=\n");
fclose(handle);
}
/* *always* write disk configuration */
if (!(write_disk_configs(&hdparams))){
errorbox(ctr[TR_ERROR_WRITING_CONFIG]);