From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 22 Jul 2019 13:58:08 +0000 (+0200)
Subject: timesyncd: add Conflicts for ntpd and chronyd
X-Git-Tag: v243-rc1~70^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13136%2Fhead;p=thirdparty%2Fsystemd.git

timesyncd: add Conflicts for ntpd and chronyd

Users might end up with more than one of those service enabled, through
admin mistake, or broken installation scriptlets, or whatever. On my machine,
I had both chronyd and timesyncd happilly running at the same time. If
more than one is enabled, it's better to have just one running. Adding
Conflicts will make the issue more visible in logs too.
---

diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in
index 2d8d14f6de0..2136a85b351 100644
--- a/units/systemd-timesyncd.service.in
+++ b/units/systemd-timesyncd.service.in
@@ -15,6 +15,7 @@ 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