From dteske@vicor.com  Fri Oct 29 19:06:48 2010
Return-Path: <dteske@vicor.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B13761065670;
	Fri, 29 Oct 2010 19:06:48 +0000 (UTC)
	(envelope-from dteske@vicor.com)
Received: from postoffice.vicor.com (postoffice.vicor.com [69.26.56.53])
	by mx1.freebsd.org (Postfix) with ESMTP id 999A08FC12;
	Fri, 29 Oct 2010 19:06:48 +0000 (UTC)
Received: from [208.206.78.30] (port=54835 helo=dt.vicor.com)
	by postoffice.vicor.com with esmtpsa (SSLv3:RC4-MD5:128)
	(Exim 4.71)
	(envelope-from <dteske@vicor.com>)
	id 1PBttO-0000e7-Ci; Fri, 29 Oct 2010 11:41:37 -0700
Message-Id: <1288377694.17949.10.camel@localhost.localdomain>
Date: Fri, 29 Oct 2010 11:41:34 -0700
From: Devin Teske <dteske@vicor.com>
Reply-To: Devin Teske <devin.teske@fisglobal.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Randi Harper <randi@freebsd.org>, Devin Teske <dteske@vicor.com>
Subject: [patch] cpioVerbose=medium breaks sysinstall(8) during install of
	FreeBSD-8.x/CURRENT (all platforms/media)

>Number:         151821
>Category:       bin
>Synopsis:       [patch] cpioVerbose=medium breaks sysinstall(8) during install of FreeBSD-8.x/CURRENT (all platforms/media)
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    brucec
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 29 19:10:08 UTC 2010
>Closed-Date:    Sun Nov 21 13:25:26 UTC 2010
>Last-Modified:  Sun Nov 21 13:25:26 UTC 2010
>Originator:     Devin Teske <dteske@vicor.com>
>Release:        FreeBSD 8.1-RELEASE i386
>Organization:
VICOR
>Environment:
System: FreeBSD push810.linux.vicor.com 8.1-RELEASE FreeBSD 8.1-RELEASE
#0: Mon Jul 19 02:55:53 UTC 2010
root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386

Occurs on all archs:
alpha/amd64/arm/i386/ia64/mips/pc98/ppc/sparc64/sun4v

Occurs on all platforms:
Walnut Creek CD/DVD, FreeBSD Mall CD/DVD, USB, and from installed
distribution.

Occurs on tags:
   RELENG_8_BP
   RELENG_8_0_BP
   RELENG_8_0
   RELENG_8_0_0_RELEASE
   RELENG_8_1_BP
   RELENG_8_1
   RELENG_8_1_0_RELEASE
   RELENG_8
   MAIN
   HEAD

First occurred:
   Mon May 26 17:15:34 2008 UTC (2 years, 5 months ago)
   when src/usr.bin/cpio/* was committed to MAIN by kientzle
   with comment:

      Initial commit of bsddcpio 0.9.11b

      A new implementation of cpio that uses libarchive as it's back-end
      archiving/dearchiving infrastructure.  Includes test harness;
      "make check" in the bsdcpio directory to build and run the test
      harness.

>Description:
When installing FreeBSD, either (a) as scripted installation using
install.cfg, environment variables, or command-line arguments to
sysinstall(8) or (b) as a manual installation using ncurses(3)-based
menus, if the cpioVerbose feature is set to "medium", the installation
fails with the following errors (after performing newfs(8), upon
attempting to extract the first binary distribution-set [base]):

1. "Copy returned error status of 1!"

See: http://druidbsd.sf.net/images/cpioVerbose_medium_ttyv0_error1.png

2. "installInitial: Couldn't clone the boot floppy onto the root file system. Aborting!"

See: http://druidbsd.sf.net/images/cpioVerbose_medium_ttyv0_error2.png
NOTE: These errors (#1 and #2) occur one after the other.

3. (on the debug console):
   DEBUG: Executing command `find -x /stand | cpio -V -pdum /mnt'
   Brief Usage:
     List:    cpio -it < archive
     Extract: cpio -i < archive
     Create:  cpio -o < filenames > archive
     Help:    cpio --help
   DEBUG: Command `find -x /stand | cpio -V -pdum /mnt' returns status of 1
   
See: http://druidbsd.sf.net/images/cpioVerbose_medium_ttyv1_error.png
NOTE: When installing from CD/DVD release, this output is visible by
      pressing Alt+F4 to bring up the debug console. Also note that much
      of the information displayed in the above image requires debug=YES
      to be set for sysinstall(8) (either as an environment variable, as
      a command-line argument, or in install.cfg).

>How-To-Repeat:
Start your installation process of installing a new FreeBSD system. Feel
free to use any FreeBSD-8.x disc/media.

1. At the main menu of sysinstall(8), choose the option entitled:
   "Options        View/Set various installation options"
2. Use the UP/DOWN cursor keys to highlight the "Extract Detail" option
3. Press SPACE until `medium' is shown
4. Press Q to exit the Options-Editor
5. Perform the rest of your install as usual
6. After newfs(8) is performed, just as sysinstall(8) attempts to
   extract the first binary distribution-set (using cpio(1)), the
   installation will error-out with the above errors.

>Fix:
Below is a unified patch for three files:
   usr.sbin/sysinstall/help/shortcuts.hlp,v 1.13 (RELENG_8_1)
   usr.sbin/sysinstall/media.c,v 1.127.2.2.4.1 (RELENG_8_1)
   usr.sbin/sysinstall/sysinstall.8,v 1.81.2.3.2.1 (RELENG_8_1)

The below patch removes the `medium' option (passes `-V' to cpio(1)) for
the cpioVerbose setting, making the only two options now `high' (passes
`-v' flag to cpio(1)) or `low' (does not pass `-v' to cpio(1)).

--- usr.sbin/sysinstall/help/shortcuts.hlp.orig	2007-06-25 09:37:17.000000000 -0700
+++ usr.sbin/sysinstall/help/shortcuts.hlp	2010-10-26 15:37:45.000000000 -0700
@@ -13,7 +13,7 @@ blanktime               Screen blank tim
 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).
--- usr.sbin/sysinstall/media.c.orig	2010-06-13 19:09:06.000000000 -0700
+++ usr.sbin/sysinstall/media.c	2010-10-26 15:51:06.000000000 -0700
@@ -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 *se
     }
     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);
--- usr.sbin/sysinstall/sysinstall.8.orig	2010-06-13 19:09:06.000000000 -0700
+++ usr.sbin/sysinstall/sysinstall.8	2010-10-26 15:57:21.000000000 -0700
@@ -749,8 +749,7 @@
 .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.

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: brucec 
State-Changed-When: Sun Nov 14 10:22:15 UTC 2010 
State-Changed-Why:  
Fixed in r215291. 


Responsible-Changed-From-To: freebsd-bugs->brucec 
Responsible-Changed-By: brucec 
Responsible-Changed-When: Sun Nov 14 10:22:15 UTC 2010 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151821 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/151821: commit references a PR
Date: Sun, 14 Nov 2010 10:22:16 +0000 (UTC)

 Author: brucec
 Date: Sun Nov 14 10:22:09 2010
 New Revision: 215291
 URL: http://svn.freebsd.org/changeset/base/215291
 
 Log:
   Remove support for cpioVerbose=medium because bsdcpio doesn't support the
   "-V" flag.
   
   PR:	bin/151821
   Submitted by:	Devin Teske <dteske at vicor.com>
   MFC after:	1 week
 
 Modified:
   head/usr.sbin/sysinstall/help/shortcuts.hlp
   head/usr.sbin/sysinstall/media.c
   head/usr.sbin/sysinstall/sysinstall.8
 
 Modified: head/usr.sbin/sysinstall/help/shortcuts.hlp
 ==============================================================================
 --- head/usr.sbin/sysinstall/help/shortcuts.hlp	Sun Nov 14 10:04:48 2010	(r215290)
 +++ head/usr.sbin/sysinstall/help/shortcuts.hlp	Sun Nov 14 10:22:09 2010	(r215291)
 @@ -13,7 +13,7 @@ blanktime               Screen blank tim
  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).
 
 Modified: head/usr.sbin/sysinstall/media.c
 ==============================================================================
 --- head/usr.sbin/sysinstall/media.c	Sun Nov 14 10:04:48 2010	(r215290)
 +++ head/usr.sbin/sysinstall/media.c	Sun Nov 14 10:22:09 2010	(r215291)
 @@ -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 *se
      }
      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);
 
 Modified: head/usr.sbin/sysinstall/sysinstall.8
 ==============================================================================
 --- head/usr.sbin/sysinstall/sysinstall.8	Sun Nov 14 10:04:48 2010	(r215290)
 +++ head/usr.sbin/sysinstall/sysinstall.8	Sun Nov 14 10:22:09 2010	(r215291)
 @@ -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.
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/151821: commit references a PR
Date: Sun, 21 Nov 2010 13:05:03 +0000 (UTC)

 Author: brucec
 Date: Sun Nov 21 13:04:53 2010
 New Revision: 215631
 URL: http://svn.freebsd.org/changeset/base/215631
 
 Log:
   MFC r215286:
   
   Connect to ftp2.tr.freebsd.org when the Turkey #2 mirror is selected.
   
   PR:	bin/128587
   Submitted by: 	Mehmet Kose <mehmet.kose at gmail.com>
   
   MFC r215287:
   
   "Web" should not be all upper-case because it's not an acronym.
   
   PR:	bin/130366
   Submitted by:	Royce Williams <royce at alaska.net>
   
   MFC r215290:
   
   ntpdate(8) hosts are now configured in rc.conf via ntpdate_hosts.
   
   PR:	bin/148350
   Submitted by: Joel FAEDI <joel.faedi at gmail.com>
   
   MFC r215291:
   
   Remove support for cpioVerbose=medium because bsdcpio doesn't support the
   "-V" flag.
   
   PR:	bin/151821
   Submitted by: Devin Teske <dteske at vicor.com>
   
   MFC r215296:
   
   Fix use of CD_VERSION=any in cdrom.inf by calling strcmp instead of
   variable_cmp.
   
   PR:	bin/142960
   Submitted by: G. Paul Ziemba <p-fbsd-bugs at ziemba.us>
 
 Modified:
   stable/8/usr.sbin/sysinstall/cdrom.c
   stable/8/usr.sbin/sysinstall/config.c
   stable/8/usr.sbin/sysinstall/help/shortcuts.hlp
   stable/8/usr.sbin/sysinstall/install.c
   stable/8/usr.sbin/sysinstall/media.c
   stable/8/usr.sbin/sysinstall/menus.c
   stable/8/usr.sbin/sysinstall/sysinstall.8
   stable/8/usr.sbin/sysinstall/sysinstall.h
 Directory Properties:
   stable/8/usr.sbin/sysinstall/   (props changed)
 
 Modified: stable/8/usr.sbin/sysinstall/cdrom.c
 ==============================================================================
 --- stable/8/usr.sbin/sysinstall/cdrom.c	Sun Nov 21 12:52:33 2010	(r215630)
 +++ stable/8/usr.sbin/sysinstall/cdrom.c	Sun Nov 21 13:04:53 2010	(r215631)
 @@ -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"
 
 Modified: stable/8/usr.sbin/sysinstall/config.c
 ==============================================================================
 --- stable/8/usr.sbin/sysinstall/config.c	Sun Nov 21 12:52:33 2010	(r215630)
 +++ stable/8/usr.sbin/sysinstall/config.c	Sun Nov 21 13:04:53 2010	(r215631)
 @@ -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);
      }
 
 Modified: stable/8/usr.sbin/sysinstall/help/shortcuts.hlp
 ==============================================================================
 --- stable/8/usr.sbin/sysinstall/help/shortcuts.hlp	Sun Nov 21 12:52:33 2010	(r215630)
 +++ stable/8/usr.sbin/sysinstall/help/shortcuts.hlp	Sun Nov 21 13:04:53 2010	(r215631)
 @@ -13,7 +13,7 @@ blanktime               Screen blank tim
  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).
 
 Modified: stable/8/usr.sbin/sysinstall/install.c
 ==============================================================================
 --- stable/8/usr.sbin/sysinstall/install.c	Sun Nov 21 12:52:33 2010	(r215630)
 +++ stable/8/usr.sbin/sysinstall/install.c	Sun Nov 21 13:04:53 2010	(r215631)
 @@ -754,7 +754,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);
      }
 
 Modified: stable/8/usr.sbin/sysinstall/media.c
 ==============================================================================
 --- stable/8/usr.sbin/sysinstall/media.c	Sun Nov 21 12:52:33 2010	(r215630)
 +++ stable/8/usr.sbin/sysinstall/media.c	Sun Nov 21 13:04:53 2010	(r215631)
 @@ -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 *se
      }
      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);
 
 Modified: stable/8/usr.sbin/sysinstall/menus.c
 ==============================================================================
 --- stable/8/usr.sbin/sysinstall/menus.c	Sun Nov 21 12:52:33 2010	(r215630)
 +++ stable/8/usr.sbin/sysinstall/menus.c	Sun Nov 21 13:04:53 2010	(r215631)
 @@ -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" },
 @@ -1321,7 +1321,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.",
 @@ -1380,456 +1380,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 } },
  };
  
 
 Modified: stable/8/usr.sbin/sysinstall/sysinstall.8
 ==============================================================================
 --- stable/8/usr.sbin/sysinstall/sysinstall.8	Sun Nov 21 12:52:33 2010	(r215630)
 +++ stable/8/usr.sbin/sysinstall/sysinstall.8	Sun Nov 21 13:04:53 2010	(r215631)
 @@ -218,10 +218,10 @@ Configure host as a user of the Network 
  .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.
 @@ -749,8 +749,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.
 
 Modified: stable/8/usr.sbin/sysinstall/sysinstall.h
 ==============================================================================
 --- stable/8/usr.sbin/sysinstall/sysinstall.h	Sun Nov 21 12:52:33 2010	(r215630)
 +++ stable/8/usr.sbin/sysinstall/sysinstall.h	Sun Nov 21 13:04:53 2010	(r215631)
 @@ -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"
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: brucec 
State-Changed-When: Sun Nov 21 13:25:07 UTC 2010 
State-Changed-Why:  
Merged to stable/8. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151821 
>Unformatted:
 X-send-pr-version: 3.113
 X-GNATS-Notify: 
 
 
 >From this point-on, you must restart the installation process as you are
 returned to the main install menu of sysinstall(8) after acknowledging
 errors #1 and #2 above.
 
 The problem is entirely that cpio(1) was replaced with a new version
 that does not accept the `-V' (or `--dot') flag. Historically, previous
 releases used GNU cpio(1) (in contrib) whereas FreeBSD-8.x uses BSD cpio
 (1) which is not forward-compatible with the GNU flags.
 
 In the error visible on the debug console, we see that passing of `-V'
 for when cpioVerbose=medium results in BSD cpio(1) producing a short
 usage-statement followed by an exit with error status 1.
 
