From owner-svn-src-head@freebsd.org Tue Nov 28 20:52:24 2017 Return-Path: Delivered-To: svn-src-head@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 E7E81DEEA0E; Tue, 28 Nov 2017 20:52:24 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 97A627848F; Tue, 28 Nov 2017 20:52:24 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id JmrYei8yPRDG7JmraeUU0O; Tue, 28 Nov 2017 13:52:18 -0700 X-Authority-Analysis: v=2.2 cv=b+PC2pOx c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=sC3jslCIGhcA:10 a=6I5d2MoRAAAA:8 a=T8hboYP3AAAA:8 a=YxBL1-UpAAAA:8 a=Ix0BpYk2IbgdxZ2hD4QA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=3Xhr1e3L9Km7VwPPQCJS:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTPS id EF1A9735; Tue, 28 Nov 2017 12:52:16 -0800 (PST) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id vASKq0XB048780; Tue, 28 Nov 2017 12:52:00 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id vASKq05m048772; Tue, 28 Nov 2017 12:52:00 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201711282052.vASKq05m048772@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Alan Somers cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r326343 - head/etc/rc.d In-Reply-To: Message from Alan Somers of "Tue, 28 Nov 2017 20:44:10 +0000." <201711282044.vASKiAJw072662@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 28 Nov 2017 12:52:00 -0800 X-CMAE-Envelope: MS4wfGgE7ATF9Lnd8NQaiP0rGuo0qM5hnmpoqS+t2mF78mTlgflODLHUKl7w9j1qm34cIujsQ0BK1A/v1fvpoy4T2q0oBrBG32Ge+5fPy1Y+R3M0mPT8L7mr rXHiNysZCET3wD9VqdwrcAmZyJoRW9YVP6cCP0YbWMwkI7CQUHWKB33/dWBT4s758E+y+VO9B2+rTO5wHMuPdQwd8HqASKElCjPcslF+Bme9vPaBofFHCj6P W/U7fUocrZNZtr6A0uSxRoXFi1DO6fcdAlI4KSNQtak+HZr8/9R+QgYt9nAGqfm6 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Nov 2017 20:52:25 -0000 In message <201711282044.vASKiAJw072662@repo.freebsd.org>, Alan Somers writes: > 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 > 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) > Thanks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.