From nobody Sun Dec 3 13:43:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sjp1G73b6z52tNY; Sun, 3 Dec 2023 13:44:02 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sjp1G4cS9z4TRq; Sun, 3 Dec 2023 13:44:02 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 3B3DhuKl063272; Sun, 3 Dec 2023 07:43:56 -0600 (CST) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1701611036; bh=ZswKm/dr3ds6Lr1+hClgd261wUo8XyeysJUrFyZsubg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oP+hp2YMbaAOO1OpUhsfFKIjhbOKdDQSbKSO3t/mmv1obV/iZg/eoa2LAmP5sqy3B e4whpfnLCdlmqcRppfJ0ilCYgoiGc55EWpxrQR6cvbnTv37fTyE0BclWCn4vkXL793 sy9HiaU8dBiIQ5zvsNUTd79liKX9n6VGvauKgtxMhySio1Tn/Lhy1eMKj7TUaykRL0 Wb96ET6f01jj5uoJksRBfcklTDW62W1EizpBH/dYowt9MSTblyf1Y9ZZQMcfYHMF3N mbiD7KGVYs8858TTpI0pol1VYADZimM/+i56Uh2RkFzDdGXqWuSMoY70Lv0+9tSLTM CyYU7zpedPgvA== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id D+TVBxyGbGUm9wAAs/W3XQ (envelope-from ); Sun, 03 Dec 2023 07:43:56 -0600 From: Mike Karels To: Xin LI Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3b3195f6767b - main - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. Date: Sun, 03 Dec 2023 07:43:55 -0600 X-Mailer: MailMate (1.14r5964) Message-ID: <56101076-F237-4B1E-B6E0-A08921370B75@karels.net> In-Reply-To: <202312030701.3B371MA6049553@gitrepo.freebsd.org> References: <202312030701.3B371MA6049553@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Queue-Id: 4Sjp1G4cS9z4TRq On 3 Dec 2023, at 1:01, Xin LI wrote: > The branch main has been updated by delphij: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D3b3195f6767b39eb33b35231= 34ef988931c9c86d > > commit 3b3195f6767b39eb33b3523134ef988931c9c86d > Author: Xin LI > AuthorDate: 2023-12-03 07:00:32 +0000 > Commit: Xin LI > CommitDate: 2023-12-03 07:00:32 +0000 > > periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seco= nds.list > when ntpd is enabled. > > The leap-seconds.list is used exclusively by ntpd, therefore, do no= t bother > to perform the fetch when ntpd is not enabled. Wouldn't we want an up-to-date leapsecond file for ntpdate as well? The = daily script can't know if ntpdate is being used. Also, it seems wrong to igno= re daily_ntpd_leapfile_enable if ntpd is not enabled. Mike > PR: conf/275419 > Reviewed by: cy, michaelo, imp > MFC after: 3 days > Differential Revision: https://reviews.freebsd.org/D42875 > --- > usr.sbin/periodic/etc/daily/480.leapfile-ntpd | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd b/usr.sbin/p= eriodic/etc/daily/480.leapfile-ntpd > index 17db53e625f8..c7de845ea87d 100755 > --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd > +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd > @@ -12,9 +12,9 @@ fi > > case "$daily_ntpd_leapfile_enable" in > [Yy][Ee][Ss]) > - if service ntpd oneneedfetch; then > + if service ntpd enabled && service ntpd needfetch; then > anticongestion > - service ntpd onefetch > + service ntpd fetch > fi > ;; > esac