From fa312eba9a224a3c8ab882f8c86299c5c762a147 Mon Sep 17 00:00:00 2001
From: chengyechun <chengyechun1@huawei.com>
Date: Wed, 12 Jul 2023 09:48:25 +0800
Subject: [PATCH] add Restartandconflilctserviceinntpd.service

(cherry picked from commit 775951ec7b9ad0952f10c94ab0c8cc2a2e0bda72)
---
 ntp.spec     | 8 +++++++-
 ntpd.service | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ntp.spec b/ntp.spec
index 670ee58..3fdd29a 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -2,7 +2,7 @@
 
 Name:                  ntp
 Version:               4.2.8p15
-Release:               11
+Release:               12
 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/
@@ -214,6 +214,12 @@ make check
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Jul 12 2023 chengyechun <chengyechun1@huawei.com> - 4.2.8p15-12
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add Restart and conflilct service in ntpd.service
+
 * Wed Jun 21 2023 chengyechun <chengyechun1@huawei.com> - 4.2.8p15-11
 - Type:bugfix
 - ID:
diff --git a/ntpd.service b/ntpd.service
index a638dad..22e39fe 100644
--- a/ntpd.service
+++ b/ntpd.service
@@ -1,13 +1,14 @@
 [Unit]
 Description=Network Time Service
 After=syslog.target ntpdate.service sntp.service
-Conflicts=systemd-timesyncd.service
+Conflicts=systemd-timesyncd.service chronyd.service
 
 [Service]
 Type=forking
 EnvironmentFile=-/etc/sysconfig/ntpd
 ExecStart=/usr/sbin/ntpd -u ntp:ntp $OPTIONS
 PrivateTmp=true
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
-- 
Gitee