diff options
| author | keramida <keramida@FreeBSD.org> | 2009-01-29 06:43:29 +0000 |
|---|---|---|
| committer | keramida <keramida@FreeBSD.org> | 2009-01-29 06:43:29 +0000 |
| commit | 7a4494232bd201a9dd1b5de900a340e0667dde2d (patch) | |
| tree | 561ba01300b439a6a3e26e17b76f49fa371fcb5c | |
| parent | db7ede5c5092811fcf2a391e7118329f29143709 (diff) | |
| download | FreeBSD-src-7a4494232bd201a9dd1b5de900a340e0667dde2d.zip FreeBSD-src-7a4494232bd201a9dd1b5de900a340e0667dde2d.tar.gz | |
Backout change 187782. It inhibits ntpd from starting at all
when ntpd_sync_on_start is set.
Noticed by: rafan
| -rwxr-xr-x | etc/rc.d/ntpd | 2 | ||||
| -rw-r--r-- | share/man/man5/rc.conf.5 | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd index 3e7a8c0..7a4eef8 100755 --- a/etc/rc.d/ntpd +++ b/etc/rc.d/ntpd @@ -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 diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index e98d803..afc24c6 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -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 |
