From nobody Wed Dec 06 06:34:04 2023 X-Original-To: dev-commits-src-branches@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 4SlSKn1VBTz52tvy; Wed, 6 Dec 2023 06:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlSKn100bz4nk9; Wed, 6 Dec 2023 06:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIZNNCdXpa8NFAu/3flQQKoXNxUO8TuKg2hOKPIGhIg=; b=C9HZDnecMxwGgPhLsFFI0xyMrU42Hsxyho84Gs3QYGPrMjd+vZRTIf6eSIwGrEVJuq5+SF TPNvhvTa3v/Ab9KpeN4bJj88YejZqxuDDsDeN1ui/705acD86hOuNlsuiWycd3xl6F0lqm FSoFafXKKKt2Hzn0Fu4zJ3ybUj3JnYF+oB+PjdvJ2BmRXeftcG5V/Z/D7+k8nNep7UDLaM i/z7BIpVJjyTkJZn0vdsIqlPwd1YooSTZ0bnceRWQVAr4Zbg4TUkFiDPmR99kmN4yYNA2t xUheRkK0UoMCCfwGsedTERMlBu5w1QyLVtvgI2HZhP21vrnN0/S93w1+TqUutw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701844445; a=rsa-sha256; cv=none; b=TkZWYrQy7FVdn/Xo3MrUhZjJNezQONvliImuvmwe78ZGQVfVqCVCs3CJwXCtdVyoBRGXeG LqHFoIqPX2LyvZyc2gbucqZ30JF1Cc084Za2K6EVHijTW0WL1ZxwhZrMjgh+mSxwXP5Muq 4XRc+M2BmS89zhf15rfIyh/zSO1jhQAGlaCD58yfM6uEBo2iqIolrm/xik5gj+E8bvRZyQ wNCJTTlGPUdxuyEpCM40HeesYIMjFB9322SNewvqYtOfFTZAY+4PhWTL+wFS6X7FLr6zYQ FIiU2p2LvUiIoGu7HVkwJNGXO2f3J1qspdwqLDVcLO2R2k7tWIdH+yO35a0Zgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIZNNCdXpa8NFAu/3flQQKoXNxUO8TuKg2hOKPIGhIg=; b=DZZPTmdJ9oCpIkeh753BpS32OBFnLR1EiVkybMhemmfI2Kze5fQSNhIduzva+M2kGGk9hd ve3Csq9I8F4aQmSY+fPEZdPh45Maai4r8UOcb+7tHeE6RtLyt9Ba6Uswui8j1yoEn8t7CZ WdxjUhDUgx2ysMRFfMQih7bLVfqALJ8dWAXrtSpqpW1cEv1CvvIsBKCuosh+RM+8JJ9TLq Idzu5D7yrAYMojS16JuN2QtOY7tyyCsxjneawSwFOXX52nyOpzdJLGXwgV/KaK9Pyk9cVJ HfAEYA8QSL5nbC4sJsuaZLSm+IjD5ge81ecrAdEnjDmwylZ65otAqntJL40K4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SlSKn01wgzjJ7; Wed, 6 Dec 2023 06:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B66Y4ib031325; Wed, 6 Dec 2023 06:34:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B66Y4rv031322; Wed, 6 Dec 2023 06:34:04 GMT (envelope-from git) Date: Wed, 6 Dec 2023 06:34:04 GMT Message-Id: <202312060634.3B66Y4rv031322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 52369c5d29f5 - stable/14 - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 52369c5d29f5f291bfc98270cf13768633abe322 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=52369c5d29f5f291bfc98270cf13768633abe322 commit 52369c5d29f5f291bfc98270cf13768633abe322 Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Xin LI CommitDate: 2023-12-06 06:33:48 +0000 periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. The leap-seconds.list is used exclusively by ntpd, therefore, do not bother to perform the fetch when ntpd is not enabled. PR: conf/275419 Reviewed by: cy, michaelo, imp Differential Revision: https://reviews.freebsd.org/D42875 (cherry picked from commit 3b3195f6767b39eb33b3523134ef988931c9c86d) --- 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/periodic/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