diff options
| author | sobomax <sobomax@FreeBSD.org> | 2003-02-27 21:04:34 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2003-02-27 21:04:34 +0000 |
| commit | da06cd1031a87ef46f41be7e8b7bb32bb3409848 (patch) | |
| tree | 5d2b21e8e20a391cb2cc2bcfce34eea221306eea /usr.sbin | |
| parent | 7f365cfefebdf21bfe222dd2b5e082bd00363b85 (diff) | |
| download | FreeBSD-src-da06cd1031a87ef46f41be7e8b7bb32bb3409848.zip FreeBSD-src-da06cd1031a87ef46f41be7e8b7bb32bb3409848.tar.gz | |
Add a new variable `noInet6', which if set disables IPv6 configuration
dialog for network interfaces.
MFC after: 20 days
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/sade.h | 1 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 1 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/tcpip.c | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index 60a6590..d477f71 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.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/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 60a6590..d477f71 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 3a67cf5..628055c 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; |
