svn commit: r326343 - head/etc/rc.d

[Alan Somers]

Author: asomers
Date: Tue Nov 28 20:44:10 2017
New Revision: 326343
URL: https://svnweb.freebsd.org/changeset/base/326343

Log:
  Fix fetching ntp leapfile after 325256
  
  Submitted by:	Ronald Klop <ronald-lists at klop.ws>
  Reviewed by:	asomers
  MFC after:	3 days
  X-MFC-With:	325256

Modified:
  head/etc/rc.d/ntpd

Modified: head/etc/rc.d/ntpd
==============================================================================
--- head/etc/rc.d/ntpd	Tue Nov 28 20:37:27 2017	(r326342)
+++ head/etc/rc.d/ntpd	Tue Nov 28 20:44:10 2017	(r326343)
@@ -20,6 +20,8 @@ fetch_cmd="ntpd_fetch_leapfile"
 needfetch_cmd="ntpd_needfetch_leapfile"
 start_precmd="ntpd_precmd"
 
+ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list"
+
 load_rc_config $name
 
 ntpd_precmd()
@@ -92,15 +94,13 @@ ntpd_init_leapfile() {
 }
 
 ntpd_needfetch_leapfile() {
-	local ntp_tmp_leapfile rc verbose
+	local rc verbose
 	
 	if checkyesno ntp_leapfile_fetch_verbose; then
 		verbose=echo
 	else
 		verbose=:
 	fi
-
-	ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list"
 
 	ntp_ver_no_src=$(get_ntp_leapfile_ver $ntp_src_leapfile)
 	ntp_expiry_src=$(get_ntp_leapfile_expiry $ntp_src_leapfile)