Re: git: 3b3195f6767b - main - periodic/daily/480.leapfile-ntpd: only attempt to refresh leap-seconds.list when ntpd is enabled.

From: Mike Karels <mike_at_karels.net>
Date: Sun, 03 Dec 2023 13:43:55 UTC
On 3 Dec 2023, at 1:01, Xin LI wrote:

> The branch main has been updated by delphij:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3b3195f6767b39eb33b3523134ef988931c9c86d
>
> commit 3b3195f6767b39eb33b3523134ef988931c9c86d
> Author:     Xin LI <delphij@FreeBSD.org>
> AuthorDate: 2023-12-03 07:00:32 +0000
> Commit:     Xin LI <delphij@FreeBSD.org>
> CommitDate: 2023-12-03 07:00:32 +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.

Wouldn't we want an up-to-date leapsecond file for ntpdate as well?  The daily
script can't know if ntpdate is being used.  Also, it seems wrong to ignore
daily_ntpd_leapfile_enable if ntpd is not enabled.

		Mike

>     PR:             conf/275419
>     Reviewed by:    cy, michaelo, imp
>     MFC after:      3 days
>     Differential Revision: https://reviews.freebsd.org/D42875
> ---
>  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