[pkg-ntp-maintainers] [PATCH 1/2] debian/ntp.service: remove conflicts with systemd-timesyncd

[Dimitri John Ledkov]

Actually this patch alone is wrong, as I am out of date w.r.t.
src:systemd upload which has:

  * Drop systemd-timesyncd.service.d/disable-with-time-daemon.conf.
    All major NTP implementations ship a native service file nowadays with a
    Conflicts=systemd-timesyncd.service so this drop-in is no longer
    necessary. (Closes: #873185)

Thus it is correct for ntp.service to conflict.



On 3 October 2017 at 13:27, Dimitri John Ledkov <xnox at ubuntu.com> wrote:
> Timesyncd already neutralises itself if ntp is installed. ntp should
> be preferred as it is a more feature/function complete implementation.
> Note that systemd-timesyncd, in Debian, ships with a drop-in
> ConditionExecutable=!/usr/sbin/ntpd, meaning that timesyncd unit only
> starts if ntpd binary is not present on disk. ntp unit currently ships
> with Conflicts=systemd-timesyncd, meaning ntp unit does not start if
> systemd-timesyncd unit is enabled. But systemd-timesyncd is enabled by
> default. All of above means, that when both bin:systemd and bin:ntp
> are installed, both ntp and systemd-timesyncd units are enabled, yet
> neither are started (assuming network DHCP server does to provide NTP
> server option). Fix this by dropping redundant Conflicts in
> ntp.service unit, which thus makes ntp preffered timesync daemon when
> available.
> ---
>  debian/changelog   | 8 ++++++++
>  debian/ntp.service | 1 -
>  2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index cb4d4e2..a60266f 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,11 @@
> +ntp (1:4.2.8p10+dfsg-6) UNRELEASED; urgency=medium
> +
> +  * debian/ntp.service: remove conflicts with systemd-timesyncd, as
> +    timesyncd already neutralises itself if ntp is installed. ntp should
> +    be preferred as it is a more feature/function complete implementation.
> +
> + -- Dimitri John Ledkov <xnox at ubuntu.com>  Tue, 03 Oct 2017 13:16:10 +0100
> +
>  ntp (1:4.2.8p10+dfsg-5) unstable; urgency=medium
>
>    * Fix arch:all FTBFS due to improper moving of sntp manpage (Closes: #865227)
> diff --git a/debian/ntp.service b/debian/ntp.service
> index d384aa1..763f46b 100644
> --- a/debian/ntp.service
> +++ b/debian/ntp.service
> @@ -2,7 +2,6 @@
>  Description=Network Time Service
>  Documentation=man:ntpd(8)
>  After=network.target
> -Conflicts=systemd-timesyncd.service
>
>  [Service]
>  Type=forking
> --
> 2.7.4
>



-- 
Regards,

Dimitri.