Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Jan 2009 06:43:29 +0000 (UTC)
From:      Giorgos Keramidas <keramida@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r187879 - in head: etc/rc.d share/man/man5
Message-ID:  <200901290643.n0T6hT4B044507@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: keramida (doc committer)
Date: Thu Jan 29 06:43:29 2009
New Revision: 187879
URL: http://svn.freebsd.org/changeset/base/187879

Log:
  Backout change 187782.  It inhibits ntpd from starting at all
  when ntpd_sync_on_start is set.
  
  Noticed by:	rafan

Modified:
  head/etc/rc.d/ntpd
  head/share/man/man5/rc.conf.5

Modified: head/etc/rc.d/ntpd
==============================================================================
--- head/etc/rc.d/ntpd	Thu Jan 29 05:59:42 2009	(r187878)
+++ head/etc/rc.d/ntpd	Thu Jan 29 06:43:29 2009	(r187879)
@@ -23,7 +23,7 @@ ntpd_precmd()
 	rc_flags="-c ${ntpd_config} ${ntpd_flags}"
 
 	if checkyesno ntpd_sync_on_start; then
-		rc_flags="-q -g $rc_flags"
+		rc_flags="-g $rc_flags"
 	fi
 
 	if [ -z "$ntpd_chrootdir" ]; then

Modified: head/share/man/man5/rc.conf.5
==============================================================================
--- head/share/man/man5/rc.conf.5	Thu Jan 29 05:59:42 2009	(r187878)
+++ head/share/man/man5/rc.conf.5	Thu Jan 29 06:43:29 2009	(r187879)
@@ -2065,16 +2065,12 @@ If set to
 .Xr ntpd 8
 is run with the
 .Fl g
-and
-.Fl q
-flags, which syncs the system's clock on startup.
+flag, which syncs the system's clock on startup.
 See
 .Xr ntpd 8
 for more information regarding the
 .Fl g
-and
-.Fl q
-options.
+option.
 This is a preferred alternative to using
 .Xr ntpdate 8
 or specifying the



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901290643.n0T6hT4B044507>