From a852e825f584393e564e3c8027bada49eddf3ec2 Mon Sep 17 00:00:00 2001
From: murray <murray@FreeBSD.org>
Date: Thu, 6 Apr 2000 01:23:21 +0000
Subject: [PATCH]   Fixed minor annoyance with sysinstall being redundant /
 braindead in the network -> interfaces menu.

Approved by:	jkh
---
 release/sysinstall/tcpip.c  | 4 +++-
 usr.sbin/sysinstall/tcpip.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 1d4609a80c26..18e92878e1c3 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -444,7 +444,7 @@ tcpDeviceSelect(void)
 	msgConfirm("No network devices available!");
 	return NULL;
     }
-    else if (!RunningAsInit) {
+    else if ((!RunningAsInit) && (variable_check("NETWORK_CONFIGURED=NO") != TRUE)) {
 	if (!msgYesNo("Running multi-user, assume that the network is already configured?"))
 	    return devs[0];
     }
@@ -480,7 +480,9 @@ tcpMenuSelect(dialogMenuItem *self)
 {
     Device *tmp;
 
+    variable_set("NETWORK_CONFIGURED=NO",0);
     tmp = tcpDeviceSelect();
+    variable_unset("NETWORK_CONFIGURED");
     if (tmp && tmp->private && !((DevInfo *)tmp->private)->use_dhcp && !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);
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index 1d4609a80c26..18e92878e1c3 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -444,7 +444,7 @@ tcpDeviceSelect(void)
 	msgConfirm("No network devices available!");
 	return NULL;
     }
-    else if (!RunningAsInit) {
+    else if ((!RunningAsInit) && (variable_check("NETWORK_CONFIGURED=NO") != TRUE)) {
 	if (!msgYesNo("Running multi-user, assume that the network is already configured?"))
 	    return devs[0];
     }
@@ -480,7 +480,9 @@ tcpMenuSelect(dialogMenuItem *self)
 {
     Device *tmp;
 
+    variable_set("NETWORK_CONFIGURED=NO",0);
     tmp = tcpDeviceSelect();
+    variable_unset("NETWORK_CONFIGURED");
     if (tmp && tmp->private && !((DevInfo *)tmp->private)->use_dhcp && !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);