From 2b41f57ec24828271cbc72256afbf6947f14fac0 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Mon, 1 Nov 2010 20:20:31 +0000
Subject: Use new output format 'elf64-x86-64-freebsd' instead of
 'elf64-x86-64', and similarly 'elf64-sparc-freebsd' instead of 'elf64-sparc'.

---
 usr.sbin/ndiscvt/ndiscvt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr.sbin')

diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 5de7519..3775a33 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -190,7 +190,7 @@ bincvt(char *sysfile, char *outfile, void *img, int fsize)
 	    "objcopy -I binary -O elf32-i386-freebsd -B i386 %s %s.o\n",
 #endif
 #ifdef __amd64__
-	    "objcopy -I binary -O elf64-x86-64 -B i386 %s %s.o\n",
+	    "objcopy -I binary -O elf64-x86-64-freebsd -B i386 %s %s.o\n",
 #endif
 	    tname, outfile);
 	printf("%s", sysbuf);
@@ -229,7 +229,7 @@ firmcvt(char *firmfile)
 	    "objcopy -I binary -O elf32-i386-freebsd -B i386 %s %s.o\n",
 #endif
 #ifdef __amd64__
-	    "objcopy -I binary -O elf64-x86-64 -B i386 %s %s.o\n",
+	    "objcopy -I binary -O elf64-x86-64-freebsd -B i386 %s %s.o\n",
 #endif
 	    firmfile, outfile);
 	printf("%s", sysbuf);
-- 
cgit v1.1


From b355314642d1e24edf4e05d08b793f8b9ea76458 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Sun, 14 Nov 2010 20:47:30 +0000
Subject: Sync: merge r215273 through r215318 from ^/head.

---
 usr.sbin/sysinstall/cdrom.c            |   2 +-
 usr.sbin/sysinstall/config.c           |   6 +-
 usr.sbin/sysinstall/help/shortcuts.hlp |   2 +-
 usr.sbin/sysinstall/install.c          |   2 +-
 usr.sbin/sysinstall/media.c            |   4 -
 usr.sbin/sysinstall/menus.c            | 304 ++++++++++++++++-----------------
 usr.sbin/sysinstall/sysinstall.8       |  11 +-
 usr.sbin/sysinstall/sysinstall.h       |   4 +-
 8 files changed, 165 insertions(+), 170 deletions(-)

(limited to 'usr.sbin')

diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 6bc72d8..42ba1a0 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -145,7 +145,7 @@ mediaInitCDROM(Device *dev)
 	else {
 	    if (variable_cmp(VAR_RELNAME, cp) &&
 		variable_cmp(VAR_RELNAME, "any") &&
-		variable_cmp(cp, "any") &&
+		strcmp(cp, "any") &&
 		!bogusCDOK) {
 		msgConfirm("Warning: The version of the FreeBSD disc currently in the drive\n"
 			   "(%s) does not match the version of the boot floppy\n"
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 6e176d7..de838fe 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -495,14 +495,14 @@ configNTP(dialogMenuItem *self)
 {
     int status;
 
-    status = variable_get_value(VAR_NTPDATE_FLAGS,
+    status = variable_get_value(VAR_NTPDATE_HOSTS,
 				"Enter the name of an NTP server", 1)
 	     ? DITEM_SUCCESS : DITEM_FAILURE;
     if (status == DITEM_SUCCESS) {
 	static char tmp[255];
 
-	snprintf(tmp, sizeof(tmp), "ntpdate_enable=YES,ntpdate_flags=%s",
-		 variable_get(VAR_NTPDATE_FLAGS));
+	snprintf(tmp, sizeof(tmp), "ntpdate_enable=YES,ntpdate_hosts=%s",
+		 variable_get(VAR_NTPDATE_HOSTS));
 	self->data = tmp;
 	dmenuSetVariables(self);
     }
diff --git a/usr.sbin/sysinstall/help/shortcuts.hlp b/usr.sbin/sysinstall/help/shortcuts.hlp
index 553e96f..9ec03d0 100644
--- a/usr.sbin/sysinstall/help/shortcuts.hlp
+++ b/usr.sbin/sysinstall/help/shortcuts.hlp
@@ -13,7 +13,7 @@ blanktime               Screen blank time setting in seconds
 bootManager             Select boot manager: booteasy, standard or none
 browserBinary           Which doc browser to use (default: links)
 browserPackage          Which package to get browser from (default: links)
-cpioVerbose             How verbose to be with cpio: high, medium or low
+cpioVerbose             How verbose to be with cpio: high or low
 debug                   Extra debugging?
 defaultrouter           IP address of default route
 disk                    Which disk to operate on (ad0, da0, etc).
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 273f221..db347e2 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -756,7 +756,7 @@ nodisks:
 
     dialog_clear_norefresh();
     if (!msgYesNo("The FreeBSD package collection is a collection of thousands of ready-to-run\n"
-		  "applications, from text editors to games to WEB servers and more.  Would you\n"
+		  "applications, from text editors to games to Web servers and more.  Would you\n"
 		  "like to browse the collection now?")) {
 	(void)configPackages(self);
     }
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index fe89d70..e2f6c41 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -117,8 +117,6 @@ cpioVerbosity()
 
     if (cp && !strcmp(cp, "high"))
 	return "-v";
-    else if (cp && !strcmp(cp, "medium"))
-	return "-V";
     return "";
 }
 
@@ -848,8 +846,6 @@ mediaSetCPIOVerbosity(dialogMenuItem *self)
     }
     else {
 	if (!strcmp(cp, "low"))
-	    variable_set2(VAR_CPIO_VERBOSITY, "medium", 0);
-	else if (!strcmp(cp, "medium"))
 	    variable_set2(VAR_CPIO_VERBOSITY, "high", 0);
 	else /* must be "high" - wrap around */
 	    variable_set2(VAR_CPIO_VERBOSITY, "low", 0);
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index e2c8f5e..43c57ac 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -819,7 +819,7 @@ DMenu MenuMediaFTP = {
       { "Turkey",	"ftp.tr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.tr.freebsd.org" },
       { " Turkey #2",	"ftp2.tr.freebsd.org", NULL, dmenuSetVariable, NULL,
-	VAR_FTP_PATH "=ftp://ftp.tr.freebsd.org" },
+	VAR_FTP_PATH "=ftp://ftp2.tr.freebsd.org" },
 
       { "UK",		"ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org" },
@@ -1317,7 +1317,7 @@ DMenu MenuNetworking = {
 	dmenuVarCheck,	dmenuToggleVariable, NULL, "nfs_client_enable=YES" },
       { " NFS server",	"This machine will be an NFS server",
 	dmenuVarCheck,	configNFSServer, NULL, "nfs_server_enable=YES" },
-      { " Ntpdate",	"Select a clock-synchronization server",
+      { " Ntpdate",	"Select a clock synchronization server",
 	dmenuVarCheck,	dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']',
 	(uintptr_t)"ntpdate_enable=YES" },
       { " PCNFSD",	"Run authentication server for clients with PC-NFS.",
@@ -1376,456 +1376,456 @@ DMenu MenuNTP = {
     NULL,
     { { "None",		        "No NTP server",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=NO,ntpdate_flags=none" },
+	"ntpdate_enable=NO,ntpdate_hosts=none" },
       { "Other",		"Select a site not on this list",
 	dmenuVarsCheck, configNTP, NULL, NULL },
       { "Worldwide",		"pool.ntp.org",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=pool.ntp.org" },
       { "Asia",		"asia.pool.ntp.org",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=asia.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=asia.pool.ntp.org" },
       { "Europe",		"europe.pool.ntp.org",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=europe.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=europe.pool.ntp.org" },
       { "Oceania",		"oceania.pool.ntp.org",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=oceania.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=oceania.pool.ntp.org" },
       { "North America",	"north-america.pool.ntp.org",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=north-america.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=north-america.pool.ntp.org" },
       { "Argentina",		"tick.nap.com.ar",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tick.nap.com.ar" },
+	"ntpdate_enable=YES,ntpdate_hosts=tick.nap.com.ar" },
       { "Argentina #2",		"time.sinectis.com.ar",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=time.sinectis.com.ar" },
+	"ntpdate_enable=YES,ntpdate_hosts=time.sinectis.com.ar" },
       { "Argentina #3",		"tock.nap.com.ar",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tock.nap.com.ar" },
+	"ntpdate_enable=YES,ntpdate_hosts=tock.nap.com.ar" },
       { "Australia",		"au.pool.ntp.org",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=au.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=au.pool.ntp.org" },
       { "Australia #2",		"augean.eleceng.adelaide.edu.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=augean.eleceng.adelaide.edu.au" },
+	"ntpdate_enable=YES,ntpdate_hosts=augean.eleceng.adelaide.edu.au" },
       { "Australia #3",		"ntp.adelaide.edu.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.adelaide.edu.au" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.adelaide.edu.au" },
       { "Australia #4",		"ntp.saard.net",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.saard.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.saard.net" },
       { "Australia #5",		"time.deakin.edu.au",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=time.deakin.edu.au" },
+	"ntpdate_enable=YES,ntpdate_hosts=time.deakin.edu.au" },
       { "Belgium",		"ntp1.belbone.be",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.belbone.be" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.belbone.be" },
       { "Belgium #2",		"ntp2.belbone.be",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp2.belbone.be" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2.belbone.be" },
       { "Brazil",		"a.ntp.br",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=a.ntp.br" },
+	"ntpdate_enable=YES,ntpdate_hosts=a.ntp.br" },
       { "Brazil #2",		"b.ntp.br",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=b.ntp.br" },
+	"ntpdate_enable=YES,ntpdate_hosts=b.ntp.br" },
       { "Brazil #3",		"c.ntp.br",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=c.ntp.br" },
+	"ntpdate_enable=YES,ntpdate_hosts=c.ntp.br" },
       { "Brazil #4",		"ntp.cais.rnp.br",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.cais.rnp.br" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.cais.rnp.br" },
       { "Brazil #5",		"ntp1.pucpr.br",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.pucpr.br" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.pucpr.br" },
       { "Canada",		"ca.pool.ntp.org",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ca.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=ca.pool.ntp.org" },
       { "Canada #2",		"ntp.cpsc.ucalgary.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.cpsc.ucalgary.ca" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.cpsc.ucalgary.ca" },
       { "Canada #3",		"ntp1.cmc.ec.gc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.cmc.ec.gc.ca" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.cmc.ec.gc.ca" },
       { "Canada #4",		"ntp2.cmc.ec.gc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp2.cmc.ec.gc.ca" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2.cmc.ec.gc.ca" },
       { "Canada #5",		"tick.utoronto.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=tick.utoronto.ca" },
+	"ntpdate_enable=YES,ntpdate_hosts=tick.utoronto.ca" },
       { "Canada #6",		"time.chu.nrc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=time.chu.nrc.ca" },
+	"ntpdate_enable=YES,ntpdate_hosts=time.chu.nrc.ca" },
       { "Canada #7",		"time.nrc.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=time.nrc.ca" },
+	"ntpdate_enable=YES,ntpdate_hosts=time.nrc.ca" },
       { "Canada #8",		"timelord.uregina.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=timelord.uregina.ca" },
+	"ntpdate_enable=YES,ntpdate_hosts=timelord.uregina.ca" },
       { "Canada #9",		"tock.utoronto.ca",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=tock.utoronto.ca" },
+	"ntpdate_enable=YES,ntpdate_hosts=tock.utoronto.ca" },
       { "Czech",		"ntp.karpo.cz",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.karpo.cz" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.karpo.cz" },
       { "Czech #2",		"ntp.cgi.cz",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.cgi.cz" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.cgi.cz" },
       { "Denmark",		"clock.netcetera.dk",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=clock.netcetera.dk" },
+	"ntpdate_enable=YES,ntpdate_hosts=clock.netcetera.dk" },
       { "Denmark",		"clock2.netcetera.dk",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=clock2.netcetera.dk" },
+	"ntpdate_enable=YES,ntpdate_hosts=clock2.netcetera.dk" },
       { "Spain",		"slug.ctv.es",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=slug.ctv.es" },
+	"ntpdate_enable=YES,ntpdate_hosts=slug.ctv.es" },
       { "Finland",		"tick.keso.fi",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tick.keso.fi" },
+	"ntpdate_enable=YES,ntpdate_hosts=tick.keso.fi" },
       { "Finland #2",		"tock.keso.fi",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tock.keso.fi" },
+	"ntpdate_enable=YES,ntpdate_hosts=tock.keso.fi" },
       { "France",		"ntp.obspm.fr",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.obspm.fr" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.obspm.fr" },
       { "France #2",		"ntp.univ-lyon1.fr",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.univ-lyon1.fr" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.univ-lyon1.fr" },
       { "France #3",		"ntp.via.ecp.fr",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.via.ecp.fr" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.via.ecp.fr" },
       { "Croatia",		"zg1.ntp.carnet.hr",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=zg1.ntp.carnet.hr" },
+	"ntpdate_enable=YES,ntpdate_hosts=zg1.ntp.carnet.hr" },
       { "Croatia #2",		"zg2.ntp.carnet.hr",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=zg2.ntp.carnet.hr" },
+	"ntpdate_enable=YES,ntpdate_hosts=zg2.ntp.carnet.hr" },
       { "Croatia #3",		"st.ntp.carnet.hr",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=st.ntp.carnet.hr" },
+	"ntpdate_enable=YES,ntpdate_hosts=st.ntp.carnet.hr" },
       { "Croatia #4",		"ri.ntp.carnet.hr",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ri.ntp.carnet.hr" },
+	"ntpdate_enable=YES,ntpdate_hosts=ri.ntp.carnet.hr" },
       { "Croatia #5",		"os.ntp.carnet.hr",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=os.ntp.carnet.hr" },
+	"ntpdate_enable=YES,ntpdate_hosts=os.ntp.carnet.hr" },
       { "Hungary",		"time.kfki.hu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=time.kfki.hu" },
+	"ntpdate_enable=YES,ntpdate_hosts=time.kfki.hu" },
       { "Indonesia",		"ntp.kim.lipi.go.id",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.kim.lipi.go.id" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.kim.lipi.go.id" },
       { "Ireland",		"ntp.maths.tcd.ie",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.maths.tcd.ie" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.maths.tcd.ie" },
       { "Italy",		"it.pool.ntp.org",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=it.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=it.pool.ntp.org" },
       { "Japan",		"ntp.jst.mfeed.ad.jp",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.jst.mfeed.ad.jp" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.jst.mfeed.ad.jp" },
       { "Japan IPv6",		"ntp1.v6.mfeed.ad.jp",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.v6.mfeed.ad.jp" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.v6.mfeed.ad.jp" },
       { "Korea",		"time.nuri.net",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=time.nuri.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=time.nuri.net" },
       { "Mexico",		"mx.pool.ntp.org",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=mx.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=mx.pool.ntp.org" },
       { "Netherlands",		"ntp0.nl.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp0.nl.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp0.nl.net" },
       { "Netherlands #2",	"ntp1.nl.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.nl.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.nl.net" },
       { "Netherlands #3",	"ntp2.nl.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp2.nl.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2.nl.net" },
       { "Norway",		"fartein.ifi.uio.no",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=fartein.ifi.uio.no" },
+	"ntpdate_enable=YES,ntpdate_hosts=fartein.ifi.uio.no" },
       { "Norway #2",		"time.alcanet.no",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=time.alcanet.no" },
+	"ntpdate_enable=YES,ntpdate_hosts=time.alcanet.no" },
       { "New Zealand",		"ntp.massey.ac.nz",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.massey.ac.nz" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.massey.ac.nz" },
       { "New Zealand #2",	"ntp.public.otago.ac.nz",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.public.otago.ac.nz" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.public.otago.ac.nz" },
       { "New Zealand #3",	"tk1.ihug.co.nz",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tk1.ihug.co.nz" },
+	"ntpdate_enable=YES,ntpdate_hosts=tk1.ihug.co.nz" },
       { "New Zealand #4",	"ntp.waikato.ac.nz",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.waikato.ac.nz" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.waikato.ac.nz" },
       { "Poland",		"info.cyf-kr.edu.pl",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=info.cyf-kr.edu.pl" },
+	"ntpdate_enable=YES,ntpdate_hosts=info.cyf-kr.edu.pl" },
       { "Romania",		"ticks.roedu.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ticks.roedu.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ticks.roedu.net" },
       { "Russia",		"ru.pool.ntp.org",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ru.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=ru.pool.ntp.org" },
       { "Russia #2",		"ntp.psn.ru",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.psn.ru" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.psn.ru" },
       { "Sweden",		"se.pool.ntp.org",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=se.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=se.pool.ntp.org" },
       { "Sweden #2",		"ntp.lth.se",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.lth.se" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.lth.se" },
       { "Sweden #3",		"ntp1.sp.se",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.sp.se" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.sp.se" },
       { "Sweden #4",		"ntp2.sp.se",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp2.sp.se" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2.sp.se" },
       { "Sweden #5",		"ntp.kth.se",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.kth.se" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.kth.se" },
       { "Singapore",		"sg.pool.ntp.org",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=sg.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=sg.pool.ntp.org" },
       { "Slovenia",		"si.pool.ntp.org",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=si.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=si.pool.ntp.org" },
       { "Slovenia #2",		"sizif.mf.uni-lj.si",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=sizif.mf.uni-lj.si" },
+	"ntpdate_enable=YES,ntpdate_hosts=sizif.mf.uni-lj.si" },
       { "Slovenia #3",		"ntp1.arnes.si",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.arnes.si" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.arnes.si" },
       { "Slovenia #4",		"ntp2.arnes.si",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp2.arnes.si" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2.arnes.si" },
       { "Slovenia #5",		"time.ijs.si",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=time.ijs.si" },
+	"ntpdate_enable=YES,ntpdate_hosts=time.ijs.si" },
       { "Scotland",		"ntp.cs.strath.ac.uk",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.cs.strath.ac.uk" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.cs.strath.ac.uk" },
       { "Taiwan",              "time.stdtime.gov.tw",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=time.stdtime.gov.tw" },
+	"ntpdate_enable=YES,ntpdate_hosts=time.stdtime.gov.tw" },
       { "Taiwan #2",           "clock.stdtime.gov.tw",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=clock.stdtime.gov.tw" },
+	"ntpdate_enable=YES,ntpdate_hosts=clock.stdtime.gov.tw" },
       { "Taiwan #3",           "tick.stdtime.gov.tw",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tick.stdtime.gov.tw" },
+	"ntpdate_enable=YES,ntpdate_hosts=tick.stdtime.gov.tw" },
       { "Taiwan #4",           "tock.stdtime.gov.tw",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tock.stdtime.gov.tw" },
+	"ntpdate_enable=YES,ntpdate_hosts=tock.stdtime.gov.tw" },
       { "Taiwan #5",           "watch.stdtime.gov.tw",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=watch.stdtime.gov.tw" },
+	"ntpdate_enable=YES,ntpdate_hosts=watch.stdtime.gov.tw" },
       { "United Kingdom",	"uk.pool.ntp.org",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=uk.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=uk.pool.ntp.org" },
       { "United Kingdom #2",	"ntp.exnet.com",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.exnet.com" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.exnet.com" },
       { "United Kingdom #3",	"ntp0.uk.uu.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp0.uk.uu.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp0.uk.uu.net" },
       { "United Kingdom #4",	"ntp1.uk.uu.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.uk.uu.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.uk.uu.net" },
       { "United Kingdom #5",	"ntp2.uk.uu.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp2.uk.uu.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2.uk.uu.net" },
       { "United Kingdom #6",	"ntp2a.mcc.ac.uk",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp2a.mcc.ac.uk" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2a.mcc.ac.uk" },
       { "United Kingdom #7",	"ntp2b.mcc.ac.uk",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp2b.mcc.ac.uk" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2b.mcc.ac.uk" },
       { "United Kingdom #8",	"ntp2c.mcc.ac.uk",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp2c.mcc.ac.uk" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2c.mcc.ac.uk" },
       { "United Kingdom #9",	"ntp2d.mcc.ac.uk",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp2d.mcc.ac.uk" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2d.mcc.ac.uk" },
       { "U.S.",	"us.pool.ntp.org",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=us.pool.ntp.org" },
+	"ntpdate_enable=YES,ntpdate_hosts=us.pool.ntp.org" },
       { "U.S. AR",	"sushi.lyon.edu",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=sushi.compsci.lyon.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=sushi.compsci.lyon.edu" },
       { "U.S. AZ",	"ntp.drydog.com",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.drydog.com" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.drydog.com" },
       { "U.S. CA",	"ntp.ucsd.edu",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.ucsd.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.ucsd.edu" },
       { "U.S. CA #2",	"ntp1.mainecoon.com",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.mainecoon.com" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.mainecoon.com" },
       { "U.S. CA #3",	"ntp2.mainecoon.com",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp2.mainecoon.com" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2.mainecoon.com" },
       { "U.S. CA #4",	"reloj.kjsl.com",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=reloj.kjsl.com" },
+	"ntpdate_enable=YES,ntpdate_hosts=reloj.kjsl.com" },
       { "U.S. CA #5",	"time.five-ten-sg.com",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=time.five-ten-sg.com" },
+	"ntpdate_enable=YES,ntpdate_hosts=time.five-ten-sg.com" },
       { "U.S. DE",	"louie.udel.edu",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=louie.udel.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=louie.udel.edu" },
       { "U.S. GA",		"ntp.shorty.com",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=ntp.shorty.com" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.shorty.com" },
       { "U.S. GA #2",		"rolex.usg.edu",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=rolex.usg.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=rolex.usg.edu" },
       { "U.S. GA #3",		"timex.usg.edu",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
-	"ntpdate_enable=YES,ntpdate_flags=timex.usg.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=timex.usg.edu" },
       { "U.S. IL",	"ntp-0.cso.uiuc.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp-0.cso.uiuc.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp-0.cso.uiuc.edu" },
       { "U.S. IL #2",	"ntp-1.cso.uiuc.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp-1.cso.uiuc.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp-1.cso.uiuc.edu" },
       { "U.S. IL #3",	"ntp-1.mcs.anl.gov",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp-1.mcs.anl.gov" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp-1.mcs.anl.gov" },
       { "U.S. IL #4",	"ntp-2.cso.uiuc.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp-2.cso.uiuc.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp-2.cso.uiuc.edu" },
       { "U.S. IL #5",	"ntp-2.mcs.anl.gov",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp-2.mcs.anl.gov" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp-2.mcs.anl.gov" },
       { "U.S. IN",	"gilbreth.ecn.purdue.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=gilbreth.ecn.purdue.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=gilbreth.ecn.purdue.edu" },
       { "U.S. IN #2",	"harbor.ecn.purdue.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=harbor.ecn.purdue.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=harbor.ecn.purdue.edu" },
       { "U.S. IN #3",	"molecule.ecn.purdue.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=molecule.ecn.purdue.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=molecule.ecn.purdue.edu" },
       { "U.S. KS",	"ntp1.kansas.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.kansas.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.kansas.net" },
       { "U.S. KS #2",	"ntp2.kansas.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp2.kansas.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2.kansas.net" },
       { "U.S. MA",	"ntp.ourconcord.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.ourconcord.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.ourconcord.net" },
       { "U.S. MA #2",	"timeserver.cs.umb.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=timeserver.cs.umb.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=timeserver.cs.umb.edu" },
       { "U.S. MN",	"ns.nts.umn.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ns.nts.umn.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ns.nts.umn.edu" },
       { "U.S. MN #2",	"nss.nts.umn.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=nss.nts.umn.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=nss.nts.umn.edu" },
       { "U.S. MO",	"time-ext.missouri.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=time-ext.missouri.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=time-ext.missouri.edu" },
       { "U.S. MT",	"chronos1.umt.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=chronos1.umt.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=chronos1.umt.edu" },
       { "U.S. MT #2",	"chronos2.umt.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=chronos2.umt.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=chronos2.umt.edu" },
       { "U.S. MT #3",	"chronos3.umt.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=chronos3.umt.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=chronos3.umt.edu" },
       { "U.S. NC",	"clock1.unc.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=clock1.unc.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=clock1.unc.edu" },
       { "U.S. NV",	"cuckoo.nevada.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=cuckoo.nevada.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=cuckoo.nevada.edu" },
       { "U.S. NV #2",	"tick.cs.unlv.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tick.cs.unlv.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=tick.cs.unlv.edu" },
       { "U.S. NV #3",	"tock.cs.unlv.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tock.cs.unlv.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=tock.cs.unlv.edu" },
       { "U.S. NY",	"ntp0.cornell.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp0.cornell.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp0.cornell.edu" },
       { "U.S. NY #2",	"sundial.columbia.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=sundial.columbia.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=sundial.columbia.edu" },
       { "U.S. NY #3",	"timex.cs.columbia.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=timex.cs.columbia.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=timex.cs.columbia.edu" },
       { "U.S. PA",	"clock-1.cs.cmu.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=clock-1.cs.cmu.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=clock-1.cs.cmu.edu" },
       { "U.S. PA #2",	"clock-2.cs.cmu.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=clock-2.cs.cmu.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=clock-2.cs.cmu.edu" },
       { "U.S. PA #3",	"clock.psu.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=clock.psu.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=clock.psu.edu" },
       { "U.S. PA #4",	"fuzz.psc.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=fuzz.psc.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=fuzz.psc.edu" },
       { "U.S. PA #5",	"ntp-1.ece.cmu.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp-1.ece.cmu.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp-1.ece.cmu.edu" },
       { "U.S. PA #6",	"ntp-2.ece.cmu.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp-2.ece.cmu.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp-2.ece.cmu.edu" },
       { "U.S. TX",	"ntp.fnbhs.com",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.fnbhs.com" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.fnbhs.com" },
       { "U.S. TX #2",	"ntp.tmc.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.tmc.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.tmc.edu" },
       { "U.S. TX #3",	"ntp5.tamu.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp5.tamu.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp5.tamu.edu" },
       { "U.S. TX #4",	"tick.greyware.com",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tick.greyware.com" },
+	"ntpdate_enable=YES,ntpdate_hosts=tick.greyware.com" },
       { "U.S. TX #5",	"tock.greyware.com",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tock.greyware.com" },
+	"ntpdate_enable=YES,ntpdate_hosts=tock.greyware.com" },
       { "U.S. VA",	"ntp-1.vt.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp-1.vt.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp-1.vt.edu" },
       { "U.S. VA #2",	"ntp-2.vt.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp-2.vt.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp-2.vt.edu" },
       { "U.S. VA #3",	"ntp.cmr.gov",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.cmr.gov" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.cmr.gov" },
       { "U.S. VT",	"ntp0.state.vt.us",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp0.state.vt.us" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp0.state.vt.us" },
       { "U.S. VT #2",	"ntp1.state.vt.us",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.state.vt.us" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.state.vt.us" },
       { "U.S. VT #3",	"ntp2.state.vt.us",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp2.state.vt.us" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp2.state.vt.us" },
       { "U.S. WA",	"ntp.tcp-udp.net",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.tcp-udp.net" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.tcp-udp.net" },
       { "U.S. WI",	"ntp1.cs.wisc.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp1.cs.wisc.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp1.cs.wisc.edu" },
       { "U.S. WI #2",	"ntp3.cs.wisc.edu",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp3.cs.wisc.edu" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp3.cs.wisc.edu" },
       { "South Africa",	"ntp.cs.unp.ac.za",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=ntp.cs.unp.ac.za" },
+	"ntpdate_enable=YES,ntpdate_hosts=ntp.cs.unp.ac.za" },
       { NULL } },
 };
 
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index eccb182..ad6760c 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -217,10 +217,10 @@ Configure host as a user of the Network Time Protocol.
 .Pp
 .Sy Variables :
 .Bl -tag -width indent
-.It ntpdate_flags
-The flags to
-.Xr ntpdate 8 ,
-that is to say the name of the server to sync from.
+.It ntpdate_hosts
+Whitespace-separated list of
+.Xr ntpdate 8
+servers to sync from.
 .El
 .It configPCNFSD
 Configure host to support PC NFS.
@@ -744,8 +744,7 @@ Default: user@host
 .Sy Variables :
 .Bl -tag -width indent
 .It cpioVerbose
-Can be used to set the verbosity of cpio extractions to low, medium or
-high.
+Can be used to set the verbosity of cpio extractions to low or high.
 .El
 .It mediaGetType
 Interactively get the user to specify some type of media.
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 767bb32..d5f4b32 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -130,7 +130,7 @@
 #define VAR_INSTALL_CFG			"installConfig"
 #define VAR_INSTALL_ROOT		"installRoot"
 #define VAR_IPADDR			"ipaddr"
-#define VAR_IPV6_ENABLE			"ipv6_enable"
+#define VAR_IPV6_ENABLE			"ipv6_activate_all_interfaces"
 #define VAR_IPV6ADDR			"ipv6addr"
 #define VAR_KERN_SECURELEVEL		"kern_securelevel"
 #define VAR_KEYMAP			"keymap"
@@ -166,7 +166,7 @@
 #define VAR_NONINTERACTIVE		"nonInteractive"
 #define VAR_NOVELL			"novell"
 #define	VAR_RPCBIND_ENABLE		"rpcbind_enable"
-#define VAR_NTPDATE_FLAGS		"ntpdate_flags"
+#define VAR_NTPDATE_HOSTS		"ntpdate_hosts"
 #define VAR_PACKAGE			"package"
 #define VAR_PARTITION			"partition"
 #define VAR_PCNFSD			"pcnfsd"
-- 
cgit v1.1


From b0df1c137c1d7cc6c086e8c3de63b91a97e180c7 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Tue, 16 Nov 2010 10:33:41 +0000
Subject: Sync: merge r215319 through r215395 from ^/head, so ports can
 actually build! :)

---
 usr.sbin/config/SMM.doc/6.t      | 8 +-------
 usr.sbin/config/SMM.doc/spell.ok | 3 +--
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'usr.sbin')

diff --git a/usr.sbin/config/SMM.doc/6.t b/usr.sbin/config/SMM.doc/6.t
index f02baed..49f6e91 100644
--- a/usr.sbin/config/SMM.doc/6.t
+++ b/usr.sbin/config/SMM.doc/6.t
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)6.t	8.1 (Berkeley) 6/8/93
+.\" $FreeBSD$
 .\"
 .\".ds RH "Adding New Devices
 .ne 2i
@@ -230,10 +231,3 @@ Remember that the position in the
 device table specifies the major device number.
 The block major number is needed in the ``devices.machine'' file
 if the device is a disk.
-.PP
-With the configuration information in place, your configuration
-file appropriately modified, and a system reconfigured and rebooted
-you should incorporate the shell commands needed to install the special
-files in the file system to the file ``/dev/MAKEDEV'' or
-``/dev/MAKEDEV.local''.  This is discussed in the document ``Installing
-and Operating 4.4BSD''.
diff --git a/usr.sbin/config/SMM.doc/spell.ok b/usr.sbin/config/SMM.doc/spell.ok
index 50c4ef2..dfc5df1 100644
--- a/usr.sbin/config/SMM.doc/spell.ok
+++ b/usr.sbin/config/SMM.doc/spell.ok
@@ -1,3 +1,4 @@
+# $FreeBSD$
 ACC
 ANSEL
 ARP
@@ -38,8 +39,6 @@ Info
 Karels
 LH
 Leffler
-MAKEDEV
-MAKEDEV.local
 MASSBUS
 MAXDSIZ
 MAXTSIZ
-- 
cgit v1.1


From 79e78b2c61c034f70491270cd04b4c5672a6c0c7 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Thu, 18 Nov 2010 18:30:03 +0000
Subject: Sync: merge r215396 through r215463 from ^/head.

---
 usr.sbin/iostat/iostat.8 | 2 +-
 usr.sbin/iostat/iostat.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr.sbin')

diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 6a9ef02..69fadcf 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -348,7 +348,7 @@ write operations per second
 kilobytes read per second
 .It kw/s
 kilobytes write per second
-.It wait
+.It qlen
 transactions queue length
 .It svc_t
 average duration of transactions, in milliseconds
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index dfa5ebc..f415640 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -750,11 +750,11 @@ devstats(int perf_select, long double etime, int havelast)
 		printf("\n");
 		if (Iflag == 0)
 			printf(
-		"device     r/s   w/s    kr/s    kw/s wait svc_t  %%b  "
+		"device     r/s   w/s    kr/s    kw/s qlen svc_t  %%b  "
 			    );
 		else
 			printf(
-		"device     r/i   w/i    kr/i    kw/i wait svc_t  %%b  "
+		"device     r/i   w/i    kr/i    kw/i qlen svc_t  %%b  "
 			    );
 		if (Tflag > 0)
 			printf("tin  tout ");
-- 
cgit v1.1