aboutsummaryrefslogtreecommitdiff
path: root/release/sysinstall/tcpip.c
diff options
context:
space:
mode:
authorMurray Stokely <murray@FreeBSD.org>2000-04-06 01:23:21 +0000
committerMurray Stokely <murray@FreeBSD.org>2000-04-06 01:23:21 +0000
commitf092a22bbde929be5e69338b84f35e1600eeee68 (patch)
tree84da67010e032bb48e0626a90f7c90dcc49d4377 /release/sysinstall/tcpip.c
parent808a8f89a11d2ae416e0ea0db48b63bdfef9ebfe (diff)
Fixed minor annoyance with sysinstall being redundant / braindead in
the network -> interfaces menu. Approved by: jkh
Notes
Notes: svn path=/head/; revision=59057
Diffstat (limited to 'release/sysinstall/tcpip.c')
-rw-r--r--release/sysinstall/tcpip.c4
1 files changed, 3 insertions, 1 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);