Set pccard_ifconfig in /etc/rc.conf automatically.
This commit is contained in:
parent
faadebf26b
commit
16425993ca
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=55988
@ -69,7 +69,6 @@ pccardInitialize(void)
|
||||
char *card_irq = "";
|
||||
char *spcic_mem;
|
||||
char *scard_irq;
|
||||
char pccardd_flags[128];
|
||||
char pccardd_cmd[256];
|
||||
WINDOW *w;
|
||||
|
||||
@ -93,6 +92,8 @@ pccardInitialize(void)
|
||||
}
|
||||
close(fd);
|
||||
|
||||
variable_set2("_pccard_install", "YES", 0);
|
||||
|
||||
dmenuOpenSimple(&MenuPCICMem, FALSE);
|
||||
spcic_mem = variable_get("_pcicmem");
|
||||
dmenuOpenSimple(&MenuCardIRQ, FALSE);
|
||||
@ -165,10 +166,8 @@ pccardInitialize(void)
|
||||
strcat(pccardd_cmd, card_irq);
|
||||
strcat(pccardd_cmd, " -z");
|
||||
|
||||
variable_set2("pccard_enable", "YES", 1);
|
||||
|
||||
variable_set2("pccardd_flags", card_irq, 1);
|
||||
strcpy(pccardd_flags, card_irq);
|
||||
variable_set2("pccard_enable", "YES", 1);
|
||||
|
||||
vsystem(pccardd_cmd);
|
||||
restorescr(w);
|
||||
|
@ -360,6 +360,7 @@ tcpOpenDialog(Device *devp)
|
||||
DevInfo *di;
|
||||
char temp[512], ifn[255];
|
||||
char *ifaces;
|
||||
char *pccard;
|
||||
|
||||
if (hostname[0]) {
|
||||
variable_set2(VAR_HOSTNAME, hostname, use_dhcp ? 0 : 1);
|
||||
@ -388,6 +389,10 @@ tcpOpenDialog(Device *devp)
|
||||
else
|
||||
sprintf(temp, "inet %s %s netmask %s", ipaddr, extras, netmask);
|
||||
variable_set2(ifn, temp, 1);
|
||||
pccard = variable_get("_pccard_install");
|
||||
if (pccard && strcmp(pccard, "YES") == 0) {
|
||||
variable_set2("pccard_ifconfig", temp, 1);
|
||||
}
|
||||
ifaces = variable_get(VAR_INTERFACES);
|
||||
if (!ifaces)
|
||||
variable_set2(VAR_INTERFACES, ifaces = "lo0", 1);
|
||||
|
@ -69,7 +69,6 @@ pccardInitialize(void)
|
||||
char *card_irq = "";
|
||||
char *spcic_mem;
|
||||
char *scard_irq;
|
||||
char pccardd_flags[128];
|
||||
char pccardd_cmd[256];
|
||||
WINDOW *w;
|
||||
|
||||
@ -93,6 +92,8 @@ pccardInitialize(void)
|
||||
}
|
||||
close(fd);
|
||||
|
||||
variable_set2("_pccard_install", "YES", 0);
|
||||
|
||||
dmenuOpenSimple(&MenuPCICMem, FALSE);
|
||||
spcic_mem = variable_get("_pcicmem");
|
||||
dmenuOpenSimple(&MenuCardIRQ, FALSE);
|
||||
@ -165,10 +166,8 @@ pccardInitialize(void)
|
||||
strcat(pccardd_cmd, card_irq);
|
||||
strcat(pccardd_cmd, " -z");
|
||||
|
||||
variable_set2("pccard_enable", "YES", 1);
|
||||
|
||||
variable_set2("pccardd_flags", card_irq, 1);
|
||||
strcpy(pccardd_flags, card_irq);
|
||||
variable_set2("pccard_enable", "YES", 1);
|
||||
|
||||
vsystem(pccardd_cmd);
|
||||
restorescr(w);
|
||||
|
@ -360,6 +360,7 @@ tcpOpenDialog(Device *devp)
|
||||
DevInfo *di;
|
||||
char temp[512], ifn[255];
|
||||
char *ifaces;
|
||||
char *pccard;
|
||||
|
||||
if (hostname[0]) {
|
||||
variable_set2(VAR_HOSTNAME, hostname, use_dhcp ? 0 : 1);
|
||||
@ -388,6 +389,10 @@ tcpOpenDialog(Device *devp)
|
||||
else
|
||||
sprintf(temp, "inet %s %s netmask %s", ipaddr, extras, netmask);
|
||||
variable_set2(ifn, temp, 1);
|
||||
pccard = variable_get("_pccard_install");
|
||||
if (pccard && strcmp(pccard, "YES") == 0) {
|
||||
variable_set2("pccard_ifconfig", temp, 1);
|
||||
}
|
||||
ifaces = variable_get(VAR_INTERFACES);
|
||||
if (!ifaces)
|
||||
variable_set2(VAR_INTERFACES, ifaces = "lo0", 1);
|
||||
|
Loading…
Reference in New Issue
Block a user