From owner-svn-src-stable-11@freebsd.org Wed Dec 6 00:00:38 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84A36E87939; Wed, 6 Dec 2017 00:00:38 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E291795FF; Wed, 6 Dec 2017 00:00:38 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB600bBH082579; Wed, 6 Dec 2017 00:00:37 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB600bZg082578; Wed, 6 Dec 2017 00:00:37 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201712060000.vB600bZg082578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 6 Dec 2017 00:00:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r326604 - in stable: 10/etc/rc.d 11/etc/rc.d X-SVN-Group: stable-11 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in stable: 10/etc/rc.d 11/etc/rc.d X-SVN-Commit-Revision: 326604 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2017 00:00:38 -0000 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 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)