d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed minor annoyance with sysinstall being redundant / braindead in

Browse Source 
the network -> interfaces menu.

Approved by:	jkh
This commit is contained in:
murray 2000-04-06 01:23:21 +00:00
parent 1016927db1
commit a852e825f5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/sysinstall/tcpip.c
View File

@ -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);

4
usr.sbin/sysinstall/tcpip.c
View File

@ -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);