From nobody Wed Feb 14 06:27:47 2024 X-Original-To: dev-commits-src-all@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 4TZStC4FYbz5B6pg; Wed, 14 Feb 2024 06:27:47 +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 4TZStC2lcsz4Ytn; Wed, 14 Feb 2024 06:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707892067; 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=N+Ibxf7zhG+FPxAKfNyyGWWvVMIDV9Gdqv/mYAmUrkI=; b=JBw/ZJFOg/NPXxlnoYAhHTJ3aZbEru32eX1snBM1rMTLW8xBXqEkrIhxl3HaAV8US7x9w9 OMJArlsqBLB1pfe9VFTFDsBszp6xfsJqK6VyhZifk5sp8r3J+awstZwaWcBjuBneEh1ky+ n7lifZkWzeA707hIMw5m+a/gNxULWJKvS4ve3lYxN52L1++pmAX3oBI+rIvk72bAHGhOQI abLDqzkp1fXkugZfP90H1xybBbfX+C49nKIcsd1aV7QpLQbCsAf4Sf8xipQ6q3zfq6uU2+ W/u056H5Z4fbEt1RsacnYMfuQmtchXyYFje7RzDyq4Yrz9HFiYWiQfPby7uzVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707892067; a=rsa-sha256; cv=none; b=oaziopdVR9Lm6qkpH7l6nKiymOufQnVaytB5l8pBzdL17NNxfZwfbz/cT9jONZAZnS4aY7 bdd13tQcO3zrD81moysCepeD/fvZRCcu8xLkuyjziucb7sEWlBcz14vt7dlIP9mxXqRiHe ta8PAZbizgfmw6lLANwGCkwfCIMmezw2rXGUfK+Agl4Tya/VycEQfLuWqn+ZPimFucSsmM z9B0CKA8YTPFd7InsLyu4n6xV+So9JPyuKHJJUnJXwUV8KpMmESl77mdYWBJBtUavrAXds zcCdk0K1c+bi2205buKgThH8uLB44RXjJkhUbgizmmdkgrF/IMPqdL9tEwgFnQ== 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=1707892067; 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=N+Ibxf7zhG+FPxAKfNyyGWWvVMIDV9Gdqv/mYAmUrkI=; b=Lv5CF8b576nrv1mBNUEXWQARl436vRKa00PeeqGweLoW6uEZqrH9y9mQhiiHPtKrkJqg6s e6+eLPTS0S5PRaGMieHQRBAarsbtpDmar9QmakfaJl1WIhxyJHIPTdi4vw4xnwVvxiKC9x HllVGHmDtTaK+6hbkU4RV4h8hia49AH7JgGD93vIskfqHXDHpKviZ2qp8gFmaaUzgWUxH0 nwjlM4TNGGeXa0WC4mg1MDAOuri29YqgnxkjFrGWOiro0Q9MAOZN0EHdx6e2LFK7AoH1ko 5SLrDqkp2aADM5d7KOSdIQKxIRbfMRICdU8KBbIJmQeq5tkc+xLNTGvbMT1ulQ== 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 4TZStC1s86zncR; Wed, 14 Feb 2024 06:27:47 +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 41E6Rlrn019084; Wed, 14 Feb 2024 06:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E6Rl0f019081; Wed, 14 Feb 2024 06:27:47 GMT (envelope-from git) Date: Wed, 14 Feb 2024 06:27:47 GMT Message-Id: <202402140627.41E6Rl0f019081@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 66bb668fe5f2 - releng/13.2 - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 66bb668fe5f2561844f5b79251ea42e1bfce9aee Auto-Submitted: auto-generated The branch releng/13.2 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=66bb668fe5f2561844f5b79251ea42e1bfce9aee commit 66bb668fe5f2561844f5b79251ea42e1bfce9aee Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Philip Paeps CommitDate: 2024-02-14 06:25:34 +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) (cherry picked from commit 3ef596c6e80562710da09c16558d7351749ea143) Security: FreeBSD-EN-24:01.tzdata Approved by: so (gordon) --- 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 a693986e0dd1..f4a1edb8d5a2 100755 --- a/usr.sbin/periodic/etc/daily/480.leapfile-ntpd +++ b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd @@ -13,9 +13,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