svn commit: r326604 - in stable: 10/etc/rc.d 11/etc/rc.d

[Cy Schubert]

Author: cy
Date: Wed Dec  6 00:00:37 2017
New Revision: 326604
URL: https://svnweb.freebsd.org/changeset/base/326604

Log:
  MFC r326343:
  
  Fix fetching ntp leapfile after 325256
  
  Submitted by:	Ronald Klop <ronald-lists at klop.ws>
  Original commit by:    asomers
  MFC PR:		224126

Modified:
  stable/11/etc/rc.d/ntpd
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/etc/rc.d/ntpd
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/etc/rc.d/ntpd
==============================================================================
--- stable/11/etc/rc.d/ntpd	Tue Dec  5 23:06:15 2017	(r326603)
+++ stable/11/etc/rc.d/ntpd	Wed Dec  6 00:00:37 2017	(r326604)
@@ -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)