svn commit: r187782 - in head: etc/rc.d share/man/man5

[Giorgos Keramidas]

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