Attachment #185920 for bug #199127

View | Details | Raw Unified | Return to bug 199127
Collapse All | Expand All

Lines 370-377 Link Here

(-)defaults/rc.conf (-2 lines)
370	ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one.	370	ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one.
371	ntpd_config="/etc/ntp.conf" # ntpd(8) configuration file	371	ntpd_config="/etc/ntp.conf" # ntpd(8) configuration file
372	ntpd_sync_on_start="NO" # Sync time on ntpd startup, even if offset is high	372	ntpd_sync_on_start="NO" # Sync time on ntpd startup, even if offset is high
373	ntpd_flags="-p /var/run/ntpd.pid -f /var/db/ntpd.drift"
374	# Flags to ntpd (if enabled).
375	ntp_src_leapfile="/etc/ntp/leap-seconds"	373	ntp_src_leapfile="/etc/ntp/leap-seconds"
376	# Initial source for ntpd leapfile	374	# Initial source for ntpd leapfile
377	ntp_db_leapfile="/var/db/ntpd.leap-seconds.list"	375	ntp_db_leapfile="/var/db/ntpd.leap-seconds.list"





ntpd_precmd()
{
	command_args="-c $ntpd_config -p $pidfile -f /var/db/ntpd.drift"

	if checkyesno ntpd_sync_on_start; then
		command_args="-g $command_args"
	fi

	ntpd_init_leapfile

	ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift
	ln -fs "${ntpd_chrootdir}${ntp_tmp_leapfile}" ${ntp_tmp_leapfile}

	command_args="-u ntpd:ntpd -i $ntpd_chrootdir $command_args"
	#
	rc_flags="-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags"
}

current_ntp_ts() {

Return to bug 199127

Lines 23-32 Link Here

(-)rc.d/ntpd (-5 / +3 lines)
23		23
24	ntpd_precmd()	24	ntpd_precmd()
25	{	25	{
26	rc_flags="-c ${ntpd_config} ${ntpd_flags}"	26	command_args="-c $ntpd_config -p $pidfile -f /var/db/ntpd.drift"
27		27
28	if checkyesno ntpd_sync_on_start; then	28	if checkyesno ntpd_sync_on_start; then
29	rc_flags="-g $rc_flags"	29	command_args="-g $command_args"
30	fi	30	fi
31		31
32	ntpd_init_leapfile	32	ntpd_init_leapfile
Lines 55-63 Link Here
55	ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift	55	ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift
56	ln -fs "${ntpd_chrootdir}${ntp_tmp_leapfile}" ${ntp_tmp_leapfile}	56	ln -fs "${ntpd_chrootdir}${ntp_tmp_leapfile}" ${ntp_tmp_leapfile}
57		57
58	# Change run_rc_commands()'s internal copy of $ntpd_flags	58	command_args="-u ntpd:ntpd -i $ntpd_chrootdir $command_args"
59	#
60	rc_flags="-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags"
61	}	59	}
62		60
63	current_ntp_ts() {	61	current_ntp_ts() {