From nobody Wed Dec 06 06:34:39 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 4SlSLR6msyz52twC; Wed, 6 Dec 2023 06:34:39 +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 4SlSLR5pHNz4pNf; Wed, 6 Dec 2023 06:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701844479; 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=Eir9kCYEi86+plNbHZyHaXgNDQ3aYDer88gN/h2Qdb8=; b=CMy9KarTAgKTmGMQk7/k9ZnLbzhFvqOK+Ce3kJ8cbanDb6JI8U2HzYDKMfiNpC1rPdhtTU reeaMZ6R2UT1cEn8xYEGiQ2X8PlZYHXRKhvIXq/I69glfiV1MOP9zUlDDPQi3fbGPxPojI 1ax+L/13vEjtXeiG/r65x1nsaxRJDFx9NNK31JIaTQH1f1Pvgkx8JUl2PVWsGhV4CaR/SX cCZwRtvT4F2M32FdorUi+Yx8r/OIO8V7OgS6HAEB4K15iYVD+Apxn1+eVdlR1CprTyBKVh kW/+c8L2E52QjeAHa0eqIXvBXV9kDdHXIGWF7X93453XHGc82D0zOo3cYu0ETQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701844479; a=rsa-sha256; cv=none; b=g5X9n2hpCJPKDcpp5L7MPLn6MtxMOrnXDNBQGybMmSwtA3G5wsduetzailtvM0a2MLmSiN iulRU3wHv16F9tbH0gSgblrlrQjZQTfZrE9dc4p45iVmCAFQq7auh6mSyS9RG/CaLfzI8k 3dOcbXvIpsupAaEEWqNd4V9jbdTwLsjufcXEyewLFuKhDGddML/yUsuLL19MKVVkhqY9cV 7n9TLj55wjLEIkdupNq2krzQTTHzKYeS0vrQdjI4ZyhYi6RqyRNdXTdHOGCF6lKJel/Wkp kEUiZ12zFoF0dDuIpmJxIbn5eedy+K2ejAd6TnxitG9O1lL6zgDpEQ1xAZL0mA== 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=1701844479; 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=Eir9kCYEi86+plNbHZyHaXgNDQ3aYDer88gN/h2Qdb8=; b=I8aCLrCKZb++fTGvFUYSVCA4HHhy7VLiFm+VdHXqXWTGcpfDQMAb4ELZoOUd69n26N2934 4dLL1BGI6BwIPVWX1SOedtWPE+mgBisLwUfRn/LepDar9fMzprmf+xWR9E4cBGjmHuO5cJ M3viTVmbagd5YCqGVkKfWlVwHGJfgNwPvY+3c5nkujfssB14qBAYsyV3I87BrGBxdXPMZf sQBY6yatWsM+GDYOVFVOkzr0szWw7sw1kxiSvRKefoGvznmrfz66RF5oNHq2Osa8gW5fGg k3MCW6Feun+f06t7xjmssyo2/Di8j6O4xAxGXTqaBiRIf47CPuQVcHPqwkyltg== 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 4SlSLR4rpNzjgf; Wed, 6 Dec 2023 06:34:39 +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 3B66Yd1f031538; Wed, 6 Dec 2023 06:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B66Yd27031535; Wed, 6 Dec 2023 06:34:39 GMT (envelope-from git) Date: Wed, 6 Dec 2023 06:34:39 GMT Message-Id: <202312060634.3B66Yd27031535@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: 3ef596c6e805 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 3ef596c6e80562710da09c16558d7351749ea143 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=3ef596c6e80562710da09c16558d7351749ea143 commit 3ef596c6e80562710da09c16558d7351749ea143 Author: Xin LI AuthorDate: 2023-12-03 07:00:32 +0000 Commit: Xin LI CommitDate: 2023-12-06 06:34:26 +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