YAMF22

1 files changed, 46 insertions, 23 deletions

diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 7c7a6b2..82032d8 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.137 1997/06/09 01:19:44 jkh Exp $
+ * $Id: menus.c,v 1.138 1997/06/13 14:06:10 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -1145,7 +1145,7 @@ DMenu MenuNetworking = {
 	dmenuVarCheck, configNovell, NULL, "novell" },
 #endif
       { "Ntpdate",	"Select a clock-syncronization server",
-	dmenuVarCheck,	dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)VAR_NTPDATE },
+	dmenuVarCheck,	dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', "ntpdate_enable=YES" },
       { "router",	"Select routing daemon (default: routed)",
 	dmenuVarCheck, configRouter, NULL, "router" },
       { "Rwhod",	"This machine wants to run the rwho daemon",
@@ -1169,46 +1169,69 @@ DMenu MenuNTP = {
     "close to you to have your system time syncronized accordingly.",
     "These are the primary open-access NTP servers",
     NULL,
-    { { "Other",		"Select a site not on this list",
-	dmenuVarCheck, configNTP, NULL, NULL },
+    { { "None",		        "No ntp server",
+	dmenuVarCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=NO,ntpdate_flags=" },
+      { "Other",		"Select a site not on this list",
+	dmenuVarsCheck, configNTP, NULL, 
+	NULL },
       { "Australia",		"ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntp.syd.dms.csiro.au" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp.syd.dms.csiro.au" },
       { "Canada",		"tick.usask.ca (GOES clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=tick.usask.ca" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=tick.usask.ca" },
       { "France",		"canon.inria.fr (TDF clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=canon.inria.fr" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=canon.inria.fr" },
       { "Germany",		"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.uni-erlangen.de" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntps1-0.uni-erlangen.de" },
       { "Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.cs.tu-berlin.de" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntps1-0.cs.tu-berlin.de" },
       { "Japan",		"clock.nc.fukuoka-u.ac.jp (GPS clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clock.nc.fukuoka-u.ac.jp" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=clock.nc.fukuoka-u.ac.jp" },
       { "Japan #2",		"clock.tl.fukuoka-u.ac.jp (GPS clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clock.tl.fukuoka-u.ac.jp" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=clock.tl.fukuoka-u.ac.jp" },
       { "Netherlands",		"ntp0.nl.net (GPS clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntp0.nl.net" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ntp0.nl.net" },
       { "Norway",		"timer.unik.no (NTP clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=timer.unik.no" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=timer.unik.no" },
       { "Sweden",		"Time1.Stupi.SE (Cesium/GPS)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=Time1.Stupi.SE" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=Time1.Stupi.SE" },
       { "Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=swisstime.ethz.ch" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=swisstime.ethz.ch" },
       { "U.S. East Coast",	"bitsy.mit.edu (WWV clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=bitsy.mit.edu" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=bitsy.mit.edu" },
       { "U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=otc1.psu.edu" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=otc1.psu.edu" },
       { "U.S. West Coast",	"apple.com (WWV clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=apple.com" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=apple.com" },
       { "U.S. West Coast #2",	"clepsydra.dec.com (GOES clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clepsydra.dec.com" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=clepsydra.dec.com" },
       { "U.S. West Coast #3",	"clock.llnl.gov (WWVB clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clock.llnl.gov" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=clock.llnl.gov" },
       { "U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ncar.ucar.edu" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=ncar.ucar.edu" },
       { "U.S. Pacific",		"chantry.hawaii.net (WWV/H clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=chantry.hawaii.net" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=chantry.hawaii.net" },
       { "U.S. Southwest",	"shorty.chpc.utexas.edu (WWV clock)",
-	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=shorty.chpc.utexas.edu" },
+	dmenuVarsCheck,	dmenuSetVariables, NULL, 
+	"ntpdate_enable=YES,ntpdate_flags=shorty.chpc.utexas.edu" },
       { NULL } },
 };