summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/tcpip.c
diff options
context:
space:
mode:
authormurray <murray@FreeBSD.org>2000-04-06 01:23:21 +0000
committermurray <murray@FreeBSD.org>2000-04-06 01:23:21 +0000
commita852e825f584393e564e3c8027bada49eddf3ec2 (patch)
tree81ef8f0c0070a5cb3e9e9be7e5b48c72c2b5b8c9 /usr.sbin/sysinstall/tcpip.c
parent1016927db1553a5f7b24549bab4fb9c215ddc031 (diff)
downloadFreeBSD-src-a852e825f584393e564e3c8027bada49eddf3ec2.zip
FreeBSD-src-a852e825f584393e564e3c8027bada49eddf3ec2.tar.gz
Fixed minor annoyance with sysinstall being redundant / braindead in
the network -> interfaces menu. Approved by: jkh
Diffstat (limited to 'usr.sbin/sysinstall/tcpip.c')
-rw-r--r--usr.sbin/sysinstall/tcpip.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index 1d4609a..18e9287 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);
OpenPOWER on IntegriCloud