git: 66bb668fe5f2 - releng/13.2 - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 14 Feb 2024 06:27:47 UTC
The branch releng/13.2 has been updated by philip:
URL: https://cgit.FreeBSD.org/src/commit/?id=66bb668fe5f2561844f5b79251ea42e1bfce9aee
commit 66bb668fe5f2561844f5b79251ea42e1bfce9aee
Author: Xin LI <delphij@FreeBSD.org>
AuthorDate: 2023-12-03 07:00:32 +0000
Commit: Philip Paeps <philip@FreeBSD.org>
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