summaryrefslogtreecommitdiffstats
path: root/release/sysinstall
diff options
context:
space:
mode:
authormurray <murray@FreeBSD.org>2000-08-28 18:18:47 +0000
committermurray <murray@FreeBSD.org>2000-08-28 18:18:47 +0000
commit7918d735c00a603f936e9a99bcb9783cf808f7ad (patch)
treeedfb099d76255304599452de7466670ed9d6f519 /release/sysinstall
parentb008bd149c5c4e3b67b8d8dde1ae0fc073f68b7a (diff)
downloadFreeBSD-src-7918d735c00a603f936e9a99bcb9783cf808f7ad.zip
FreeBSD-src-7918d735c00a603f936e9a99bcb9783cf808f7ad.tar.gz
This allows you to script sysinstall to say "NO" to DHCP and IPv6.
Previously, you could only script these features if you said YES. Oops. Accidentally commited to releng_4 first. PR: 20334 Approved by: jkh
Diffstat (limited to 'release/sysinstall')
-rw-r--r--release/sysinstall/tcpip.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index dc06e68..62cb251 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -267,7 +267,8 @@ tcpOpenDialog(Device *devp)
char *cp;
/* Try a RTSOL scan if such behavior is desired */
- if (!variable_cmp(VAR_TRY_RTSOL, "YES") || !msgYesNo("Do you want to try IPv6 configuration of the interface?")) {
+ if (!variable_cmp(VAR_TRY_RTSOL, "YES") ||
+ ((variable_cmp(VAR_TRY_RTSOL, "NO")) && (!msgYesNo("Do you want to try IPv6 configuration of the interface?")))) {
int i;
i = 0;
@@ -286,7 +287,8 @@ tcpOpenDialog(Device *devp)
}
/* First try a DHCP scan if such behavior is desired */
- if (!variable_cmp(VAR_TRY_DHCP, "YES") || !msgYesNo("Do you want to try DHCP configuration of the interface?")) {
+ if (!variable_cmp(VAR_TRY_DHCP, "YES") ||
+ ((variable_cmp(VAR_TRY_DHCP, "NO")) && (!msgYesNo("Do you want to try DHCP configuration of the interface?")))) {
Mkdir("/var/db");
Mkdir("/var/run");
Mkdir("/tmp");
OpenPOWER on IntegriCloud