diff options
author | jkh <jkh@FreeBSD.org> | 1997-09-17 13:33:14 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1997-09-17 13:33:14 +0000 |
commit | 0dfe9b61e4cbf3786d7f51e0703645e80c84ef26 (patch) | |
tree | 89c19c13c6eb6532a43224028e62d1a15ef3dd11 /usr.sbin/sysinstall/tcpip.c | |
parent | a3046d377e5b3b6b10624a5314055f4923bcd45f (diff) | |
download | FreeBSD-src-0dfe9b61e4cbf3786d7f51e0703645e80c84ef26.zip FreeBSD-src-0dfe9b61e4cbf3786d7f51e0703645e80c84ef26.tar.gz |
Add a new netInteractive variable so that the interactiveness of the TCP
setup dialog from scripts is more controllable. No more biasing off of
hostname (which is now non-optional in the non-netInteractive case).
Requested by: pst
Diffstat (limited to 'usr.sbin/sysinstall/tcpip.c')
-rw-r--r-- | usr.sbin/sysinstall/tcpip.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c index 33c7f307..f702e71 100644 --- a/usr.sbin/sysinstall/tcpip.c +++ b/usr.sbin/sysinstall/tcpip.c @@ -1,5 +1,5 @@ /* - * $Id: tcpip.c,v 1.69 1997/06/18 05:11:37 jkh Exp $ + * $Id: tcpip.c,v 1.70 1997/09/08 11:09:11 jkh Exp $ * * Copyright (c) 1995 * Gary J Palmer. All rights reserved. @@ -211,8 +211,14 @@ tcpOpenDialog(Device *devp) save = savescr(); /* If non-interactive, jump straight over the dialog crap and into config section */ - if (variable_get(VAR_NONINTERACTIVE) && hostname[0]) - goto netconfig; + if (variable_get(VAR_NONINTERACTIVE) && !variable_get("netInteractive")) { + if (!hostname[0]) + msgConfirm("WARNING: hostname variable not set and is a non-optional\n" + "parameter. Please add this to your installation script\n" + "or set the netInteractive variable (see sysinstall man page)"); + else + goto netconfig; + } /* Now do all the screen I/O */ dialog_clear_norefresh(); |