!21 在ntpd.service的Conflicts选项中加入chronyd.service

From: @renmingshuai
Reviewed-by: @wangxp006,@wangxp006
Signed-off-by: @wangxp006,@wangxp006

ntp.spec

@@ -2,7 +2,7 @@
 
 Name:                  ntp
 Version:               4.2.8p15
-Release:               5
+Release:               6
 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
+* Fri Dec 3 2021 renmingshuai<renmingshuai@huawei.com> - 4.2.8p15-6
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: add conflict with chronyd.service in ntpd.service
+
 * Wed Dec 1 2021 renmingshuai<renmingshuai@huawei.com> - 4.2.8p15-5
 - Type:bugfix
 - ID:NA

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