aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/sysinstall
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2003-02-27 21:04:34 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2003-02-27 21:04:34 +0000
commit9434c1a30b8586934eca8cd6c014820e0a302c49 (patch)
tree5d2b21e8e20a391cb2cc2bcfce34eea221306eea /usr.sbin/sysinstall
parentfdb8bf0997e6eb69bd435d0d0a7e90409387eac4 (diff)
Notes
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r--usr.sbin/sysinstall/sysinstall.h1
-rw-r--r--usr.sbin/sysinstall/tcpip.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 60a659032af0..d477f7151a32 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -165,6 +165,7 @@
#define VAR_NO_CONFIRM "noConfirm"
#define VAR_NO_ERROR "noError"
#define VAR_NO_HOLOSHELL "noHoloShell"
+#define VAR_NO_INET6 "noInet6"
#define VAR_NO_WARN "noWarn"
#define VAR_NO_USR "noUsr"
#define VAR_NO_TMP "noTmp"
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index 3a67cf5707f1..628055c2ba45 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -368,8 +368,9 @@ tcpOpenDialog(Device *devp)
* If it was configured to anything else, treat it as NO.
* Otherwise, ask the question interactively.
*/
- if (!variable_cmp(VAR_TRY_RTSOL, "YES") ||
- (variable_get(VAR_TRY_RTSOL)==0 && !msgNoYes("Do you want to try IPv6 configuration of the interface?"))) {
+ if (!variable_get(VAR_NO_INET6) &&
+ (!variable_cmp(VAR_TRY_RTSOL, "YES") ||
+ (variable_get(VAR_TRY_RTSOL)==0 && !msgNoYes("Do you want to try IPv6 configuration of the interface?")))) {
int i;
size_t len;