packages/ntp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add conflict with chronyd.service in ntpd.service

Browse Source
This commit is contained in:
renmingshuai 2021-12-03 16:22:54 +08:00 committed by renmingshuai
parent d40635ab34
commit ad61d34b56
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ntp.spec
View File

@ -2,7 +2,7 @@
Name: ntp Name: ntp
Version: 4.2.8p15 Version: 4.2.8p15
Release: 5 Release: 6
Summary: A protocol designed to synchronize the clocks of computers over a network Summary: A protocol designed to synchronize the clocks of computers over a network
License: MIT and BSD and BSD with advertising License: MIT and BSD and BSD with advertising
URL: https://www.ntp.org/ URL: https://www.ntp.org/
@ -208,6 +208,12 @@ make check
%{_mandir}/man8/*.8* %{_mandir}/man8/*.8*
%changelog %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 * Wed Dec 1 2021 renmingshuai<renmingshuai@huawei.com> - 4.2.8p15-5
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA

2
ntpd.service
View File

@ -1,7 +1,7 @@
[Unit] [Unit]
Description=Network Time Service Description=Network Time Service
After=syslog.target ntpdate.service sntp.service After=syslog.target ntpdate.service sntp.service
Conflicts=systemd-timesyncd.service Conflicts=chronyd.service systemd-timesyncd.service
[Service] [Service]
Type=forking Type=forking