From nobody Wed Dec 06 07:55:21 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 4SlV7Y4pfjz531hR; Wed, 6 Dec 2023 07:55:21 +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 4SlV7Y4GN0z4vR2; Wed, 6 Dec 2023 07:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701849321; 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=OxmJCsdR6UG65HjFnvSqvZVBBtjD3aAENSlcQSCFj1U=; b=W5oxRXjvKWu5g6VslYmqMqr08BU4o5M5EraZKNY+1FOj8V10UNibQE27KGqQARI+pcDdOU vEFfMD271bv9C10jrYtrSmw6mg82Lbzo00LVwUp8qGK3FXlp84i9VvyLQ77w8Ns/tYHHSn GAy3+0Q6FBYRzwZTgAC2+VJpq7LsPNAyIZQpoWNLexF38c/EUt7QfRgSvz2DMH/4aQMbr9 alOJ1UmOQmxVNZyAkqylK7cuv1CXn4ZGTHTahqvfMjZEEtKH7NsfnQpymt8wakwpSZojiB eqkaF+JkiPcsjMNzu6PI9f7hpR/ZlzUP4SNjG1fwSLTDOS56NN0UMowJ9DChTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701849321; a=rsa-sha256; cv=none; b=DpR/DYROU9noT21wvmd/3YDcT+o9DGKiPxvRKKOapVhLVI33kGnIeAXHIJG2/h9gi545xA cJVHFhPZvnMNCKbt/hef+ynwDPNwwm67HsiEZH2u4RRimivzht4b0AjebV9DbnriAe7F0d 1geLWDONw42DT0XeA0E3KxudQ5B6oTvZLDRpSCHR14yd0EIXguBrVdYBov4jHerL63GZK/ RpHCyZmTyxReZ9CQIusi/VHO8oA+KhY9aDYh47YEqLBG/y6gRmnZxEOa4Cq6334aVSKCLP /d0OAx7nehwTZ2C5GKs2VS+QuEncSxV1LCHwFVzYTvCtzzXwTo52Zsv5IFahTw== 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=1701849321; 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=OxmJCsdR6UG65HjFnvSqvZVBBtjD3aAENSlcQSCFj1U=; b=Bwu/k1765471A7bdgaE88L2fM4pd/uF2UWtAPBgigKNu5ql2t07/edBdrelH4RLU/1C33x 0uiznQMglAb3Kyzei4ZjrmCM2TMYnWwUK/yVha8dXXP4UNeZ0HyfzoMpLgOx1EnGeUP+Ck SS9SsGdHFiB24WJDyf9F4U0A1SsjQ1sLPrF4fhZ9T9obcDnB5ignYWj6L5bNh3Nu5x87Dg jvinkdSwxKVa+u9ZkkTZmAA4LcbizL8u7PoAVLbawphiYyXYzqMzfshrIrYJS9bsJEBN7R ulJvzEFIKJerphLgkvDGIMhjYYfLcQVJxIE8+B7qSD6c7yxU8B95dp8uSgbFaw== 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 4SlV7Y3CRVzl7Y; Wed, 6 Dec 2023 07:55:21 +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 3B67tLQp064646; Wed, 6 Dec 2023 07:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B67tLh6064643; Wed, 6 Dec 2023 07:55:21 GMT (envelope-from git) Date: Wed, 6 Dec 2023 07:55:21 GMT Message-Id: <202312060755.3B67tLh6064643@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: 80560eec655a - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 80560eec655ac6cd3b7d7fd0f9fe37f309b78d64 Auto-Submitted: auto-generated The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=80560eec655ac6cd3b7d7fd0f9fe37f309b78d64 commit 80560eec655ac6cd3b7d7fd0f9fe37f309b78d64 Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Xin LI CommitDate: 2023-12-06 07:55:17 +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 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