diff options
| author | seanc <seanc@FreeBSD.org> | 2004-09-14 03:01:38 +0000 |
|---|---|---|
| committer | seanc <seanc@FreeBSD.org> | 2004-09-14 03:01:38 +0000 |
| commit | dcf0d84fcdfee5b1132647f75132bb86285e750e (patch) | |
| tree | 1faac5de72526daa278edf81f0d084ccb6eac754 /etc | |
| parent | c3040d05d99f755208218d8b447b91914d2dc9a7 (diff) | |
| download | FreeBSD-src-dcf0d84fcdfee5b1132647f75132bb86285e750e.zip FreeBSD-src-dcf0d84fcdfee5b1132647f75132bb86285e750e.tar.gz | |
Stop using ntpdate(1) in our startup proceedure. Replace ntpdate(1) with
calls to ntpd -g. ntpd is noticably slower than ntpdate, but is also more
accurate. This removes the nasty hackery in rc.d/ntpdate that would parse
out ntp servers from /etc/ntp.conf (ntpd knows how to read its own config
file). By default, ntpd *will* sync with its listed time servers. To
turn this off so that ntpd does not sync, ntpd_sync_on_start="NO" can be
added to /etc/rc.conf. If ntpd is not enabled (the default), then time is
not synced on startup. ntpdate's use has been depreciated by the ntpd
authors for quite some time so this change shouldn't be unexpected.
Suggested by: des
Approved by: roberto (resident ntp guru)
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 4 | ||||
| -rwxr-xr-x | etc/rc.d/Makefile | 2 | ||||
| -rwxr-xr-x | etc/rc.d/ntpd | 5 | ||||
| -rwxr-xr-x | etc/rc.d/rpcbind | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 94eb637..792b53b 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -219,11 +219,9 @@ keyserv_flags="" # Flags to keyserv (if enabled). ### Network Time Services options: ### timed_enable="NO" # Run the time daemon (or NO). timed_flags="" # Flags to timed (if enabled). -ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO). -ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one. -ntpdate_flags="-b" # Flags to ntpdate (if enabled). ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. +ntpd_sync_on_start="YES" # Sync time on ntpd startup, even if offset is high ntpd_flags="-p /var/run/ntpd.pid -f /var/db/ntpd.drift" # Flags to ntpd (if enabled). diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 61bc3e8..690256d 100755 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -23,7 +23,7 @@ FILES= DAEMON LOGIN NETWORKING SERVERS \ mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfslocking nfsserver nisdomain nsswitch ntpd \ othermta \ pccard pcvt pf pflog preseedrandom \ power_profile ppp-user pppoed pwcheck \ diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd index 0195b09..d7c8ce1 100755 --- a/etc/rc.d/ntpd +++ b/etc/rc.d/ntpd @@ -15,10 +15,15 @@ name=ntpd rcvar=`set_rcvar` command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" +start_precmd="ntpd_precmd" required_files="/etc/ntp.conf" ntpd_precmd() { + if checkyesno ntpd_sync_on_start; then + rc_flags="-g ${ntpd_flags}" + fi + if [ -z "$ntpd_chrootdir" ]; then return 0; fi diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind index 8d8d97c..32ef973 100755 --- a/etc/rc.d/rpcbind +++ b/etc/rc.d/rpcbind @@ -5,7 +5,7 @@ # # PROVIDE: rpcbind -# REQUIRE: NETWORKING ntpdate syslogd named +# REQUIRE: NETWORKING ntpd syslogd named # KEYWORD: FreeBSD . /etc/rc.subr |
