From owner-svn-src-all@FreeBSD.ORG  Thu Jan 29 06:43:29 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A5617106566B;
	Thu, 29 Jan 2009 06:43:29 +0000 (UTC)
	(envelope-from keramida@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 93DF28FC0A;
	Thu, 29 Jan 2009 06:43:29 +0000 (UTC)
	(envelope-from keramida@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0T6hTMg044509;
	Thu, 29 Jan 2009 06:43:29 GMT
	(envelope-from keramida@svn.freebsd.org)
Received: (from keramida@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0T6hT4B044507;
	Thu, 29 Jan 2009 06:43:29 GMT
	(envelope-from keramida@svn.freebsd.org)
Message-Id: <200901290643.n0T6hT4B044507@svn.freebsd.org>
From: Giorgos Keramidas <keramida@FreeBSD.org>
Date: Thu, 29 Jan 2009 06:43:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187879 - in head: etc/rc.d share/man/man5
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jan 2009 06:43:30 -0000

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