From d788dfee15c59de220d3cadcaded24dc9fcce4d3 Mon Sep 17 00:00:00 2001
From: renmingshuai <renmingshuai@huawei.com>
Date: Sat, 4 Dec 2021 10:52:14 +0800
Subject: [PATCH] add conflict with chronyd.service in ntpd.service

---
 ntp.spec     | 8 +++++++-
 ntpd.service | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ntp.spec b/ntp.spec
index 1a8a162..0e95277 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -2,7 +2,7 @@
 
 Name:                  ntp
 Version:               4.2.8p14
-Release:               3
+Release:               4
 Summary:               A protocol designed to synchronize the clocks of computers over a network
 License:               MIT and BSD and BSD with advertising
 URL:                   https://www.ntp.org/
@@ -208,6 +208,12 @@ make check
 %{_mandir}/man8/*.8*
 
 %changelog
+* Sat Dec 4 2021 renmingshuai<renmingshuai@huawei.com> - 4.2.8p15-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: add conflict with chronyd.service in ntpd.service
+
 * Mon Nov 09 2020 xihaochen<xihaochen@huawei.com> - 4.2.8p14-3
 - Type:requirement
 - CVE:NA
diff --git a/ntpd.service b/ntpd.service
index a638dad..8370bff 100644
--- a/ntpd.service
+++ b/ntpd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Network Time Service
 After=syslog.target ntpdate.service sntp.service
-Conflicts=systemd-timesyncd.service
+Conflicts=chronyd.service systemd-timesyncd.service
 
 [Service]
 Type=forking
-- 
Gitee