From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 24 Jul 2019 15:08:05 +0000 (+0200)
Subject: Revert "timesyncd: add Conflicts for ntpd and chronyd"
X-Git-Tag: v243-rc1~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e070037c8880c5444cdb1dea729285c916b9bb33;p=thirdparty%2Fsystemd.git

Revert "timesyncd: add Conflicts for ntpd and chronyd"

This reverts commit 971a7a1526a6c1d5cb439a8a41dc65ccd4e3a66f.

These unit names are typically different on distributions, let's not
hardcode those. Stuff like this should probably live in the distro
RPM/.deb, but not upstream, where we should be distro agnostic and
agnostic to other higher level packages like this.
---

diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in
index 2136a85b351..2d8d14f6de0 100644
--- a/units/systemd-timesyncd.service.in
+++ b/units/systemd-timesyncd.service.in
@@ -15,7 +15,6 @@ ConditionVirtualization=!container
 DefaultDependencies=no
 After=systemd-remount-fs.service systemd-sysusers.service
 Before=time-set.target sysinit.target shutdown.target
-Conflicts=chronyd.service ntpd.service
 Conflicts=shutdown.target
 Wants=time-set.target time-sync.target