From owner-svn-src-head@FreeBSD.ORG  Tue Jan 27 20:13:25 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D1BD106566C;
	Tue, 27 Jan 2009 20:13:25 +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 EE4148FC0C;
	Tue, 27 Jan 2009 20:13:24 +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 n0RKDO1L095436;
	Tue, 27 Jan 2009 20:13:24 GMT
	(envelope-from keramida@svn.freebsd.org)
Received: (from keramida@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0RKDOBR095434;
	Tue, 27 Jan 2009 20:13:24 GMT
	(envelope-from keramida@svn.freebsd.org)
Message-Id: <200901272013.n0RKDOBR095434@svn.freebsd.org>
From: Giorgos Keramidas <keramida@FreeBSD.org>
Date: Tue, 27 Jan 2009 20:13:24 +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: r187782 - in head: etc/rc.d share/man/man5
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2009 20:13:25 -0000

Author: keramida (doc committer)
Date: Tue Jan 27 20:13:24 2009
New Revision: 187782
URL: http://svn.freebsd.org/changeset/base/187782

Log:
  When synchronizing the clock at system startup time, use both
  the -g and -q options.  They do a slightly different thing and
  both are necessary when the time difference is large.
  
  Noticed by:	danger, in the forums
  Approved by:	roberto
  MFC after:	1 week

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

Modified: head/etc/rc.d/ntpd
==============================================================================
--- head/etc/rc.d/ntpd	Tue Jan 27 19:56:38 2009	(r187781)
+++ head/etc/rc.d/ntpd	Tue Jan 27 20:13:24 2009	(r187782)
@@ -23,7 +23,7 @@ ntpd_precmd()
 	rc_flags="-c ${ntpd_config} ${ntpd_flags}"
 
 	if checkyesno ntpd_sync_on_start; then
-		rc_flags="-g $rc_flags"
+		rc_flags="-q -g $rc_flags"
 	fi
 
 	if [ -z "$ntpd_chrootdir" ]; then

Modified: head/share/man/man5/rc.conf.5
==============================================================================
--- head/share/man/man5/rc.conf.5	Tue Jan 27 19:56:38 2009	(r187781)
+++ head/share/man/man5/rc.conf.5	Tue Jan 27 20:13:24 2009	(r187782)
@@ -2065,12 +2065,16 @@ If set to
 .Xr ntpd 8
 is run with the
 .Fl g
-flag, which syncs the system's clock on startup.
+and
+.Fl q
+flags, which syncs the system's clock on startup.
 See
 .Xr ntpd 8
 for more information regarding the
 .Fl g
-option.
+and
+.Fl q
+options.
 This is a preferred alternative to using
 .Xr ntpdate 8
 or specifying the