Finally DTRT with tcpOpenDialog(); it should have never diddled

mediaDevice directly.

1 files changed, 17 insertions, 11 deletions

diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index b993421..e605660 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -309,6 +309,8 @@ reenter:
     return ret;
 }
 
+static Device *NetDev;
+
 static int
 netHook(dialogMenuItem *self)
 {
@@ -317,33 +319,31 @@ netHook(dialogMenuItem *self)
     devs = deviceFindDescr(self->prompt, self->title, DEVICE_TYPE_NETWORK);
     if (devs) {
 	if (DITEM_STATUS(tcpOpenDialog(devs[0])) != DITEM_FAILURE)
-	    mediaDevice = devs[0];
+	    NetDev = devs[0];
 	else
-	    devs = NULL;
+	    NetDev = NULL;
     }
     return devs ? DITEM_LEAVE_MENU : DITEM_FAILURE;
 }
 
 /* Get a network device */
-Boolean
+Device *
 tcpDeviceSelect(void)
 {
     DMenu *menu;
-    Device **devs;
+    Device **devs, *rval;
     int cnt;
-    int status;
 
     devs = deviceFind(NULL, DEVICE_TYPE_NETWORK);
     cnt = deviceCount(devs);
     if (!cnt) {
 	msgConfirm("No network devices available!");
-	status = FALSE;
+	rval = NULL;
     }
     else if (cnt == 1) {
 	if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_FAILURE))
-	    return FALSE;
-	mediaDevice = devs[0];
-	status = TRUE;
+	    return NULL;
+	rval = devs[0];
     }
     else {
 	menu = deviceCreateMenu(&MenuNetworkDevice, DEVICE_TYPE_NETWORK, netHook, NULL);
@@ -351,14 +351,20 @@ tcpDeviceSelect(void)
 	    msgFatal("Unable to create network device menu!  Argh!");
 	status = dmenuOpenSimple(menu, FALSE);
 	free(menu);
+	rval = NetDev;
     }
-    return status;
+    return rval;
 }
 
 /* Do it from a menu that doesn't care about status */
 int
 tcpMenuSelect(dialogMenuItem *self)
 {
-    (void)tcpDeviceSelect();
+    Device *tmp;
+
+    tmp = tcpDeviceSelect();
+    if (tmp && !msgYesNo("Would you like to bring the %s interface up right now?", tmp->name))
+	if (!tmp->init(tmp))
+	    msgConfirm("Initialization of %s device failed.", tmp->name);
     return DITEM_SUCCESS | DITEM_RESTORE;
 }