[ntp] add conflict with systemd-timesyncd service
Miroslav Lichvar
mlichvar at fedoraproject.org
Thu Jul 3 16:22:55 UTC 2014
commit 7880e0c1c82b0275a0b061d905b90788dceb93f2
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Thu Jul 3 18:11:52 2014 +0200
add conflict with systemd-timesyncd service
ntpd.service | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/ntpd.service b/ntpd.service
index 1084545..a638dad 100644
--- a/ntpd.service
+++ b/ntpd.service
@@ -1,6 +1,7 @@
[Unit]
Description=Network Time Service
After=syslog.target ntpdate.service sntp.service
+Conflicts=systemd-timesyncd.service
[Service]
Type=forking
More information about the scm-commits
mailing list