Package: openntpd Version: 1:5.7p4-1 Severity: normal Tags: patch Hi,
Since systemd 216, timedated no longer reads the content of the /usr/lib/systemd/ntp-units.d directory. So it seems legit to drop the related stuff implemented in the openntpd package (see patch 0001…). Consequently, alternative NTP implementations have to conflict with systemd-timesyncd to take over it (see patch 0002…). Cheers, Vincent -- System Information: Debian Release: stretch/sid APT prefers testing APT policy: (990, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 4.1.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
>From fa0ff1f37bb1fca78697ff5c361d0921f86e4141 Mon Sep 17 00:00:00 2001 From: Vincent Blut <[email protected]> Date: Tue, 8 Sep 2015 15:19:30 +0200 Subject: [PATCH 1/2] Drop systemd-timedated support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Detection of alternative NTP services via /usr/lib/systemd/ntp-units.d directory isn’t supported anymore since systemd 216. There is a replacement of systemd-timedated, named timedatex, which support this directory, but it isn’t package in Debian. So let’s drop this! Signed-off-by: Vincent Blut <[email protected]> --- debian/openntpd.list | 1 - debian/rules | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 debian/openntpd.list diff --git a/debian/openntpd.list b/debian/openntpd.list deleted file mode 100644 index 3056fe7..0000000 --- a/debian/openntpd.list +++ /dev/null @@ -1 +0,0 @@ -openntpd.service diff --git a/debian/rules b/debian/rules index d583012..cf39d90 100755 --- a/debian/rules +++ b/debian/rules @@ -45,12 +45,12 @@ install: build dh_testdir dh_testroot dh_prep - dh_installdirs var/lib/openntpd/db etc/apparmor.d usr/lib/systemd/ntp-units.d + dh_installdirs var/lib/openntpd/db etc/apparmor.d $(MAKE) install DESTDIR=$(CURDIR)/debian/openntpd install -D -m 0755 debian/config/openntpd debian/openntpd/etc/network/if-up.d/openntpd cp debian/apparmor-profile debian/openntpd/etc/apparmor.d/usr.sbin.ntpd dh_apparmor --profile-name=usr.sbin.ntpd - dh_install debian/openntpd.list usr/lib/systemd/ntp-units.d + dh_install debian/openntpd.list binary: binary-arch -- 2.5.1
>From 6696f9bf883ec36cadf1eae83c9d9251cc470b23 Mon Sep 17 00:00:00 2001 From: Vincent Blut <[email protected]> Date: Tue, 8 Sep 2015 15:51:54 +0200 Subject: [PATCH 2/2] d/openntpd.service: Conflict on systemd-timesyncd.service Alternative NTP implementations should conflict on the systemd-timesyncd service to take over it since the /usr/lib/systemd/ntp-units.d directory is ineffective in systemd >= 216. Signed-off-by: Vincent Blut <[email protected]> --- debian/openntpd.service | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/openntpd.service b/debian/openntpd.service index 821e607..311e0c6 100644 --- a/debian/openntpd.service +++ b/debian/openntpd.service @@ -1,5 +1,6 @@ [Unit] Description=OpenNTPd Network Time Protocol +Conflicts=systemd-timesyncd.service After=network.target [Service] -- 2.5.1
