Set pccard_ifconfig in /etc/rc.conf automatically.

2 files changed, 8 insertions, 4 deletions

diff --git a/release/sysinstall/pccard.c b/release/sysinstall/pccard.c
index afa9fe5..375c58e 100644
--- a/release/sysinstall/pccard.c
+++ b/release/sysinstall/pccard.c
@@ -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);
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 453fe5f..6a83bb5 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -360,6 +360,7 @@ netconfig:
 	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 @@ netconfig:
 	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);