Accepting request 597617 from home:markkp:branches:network:time

- Added /etc/chrony.d/ directory to the package (bsc#1083597)
  Modifed default chrony.conf to add "include /etc/chrony.d/*"

OBS-URL: https://build.opensuse.org/request/show/597617
OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=46
This commit is contained in:
Martin Pluskal 2018-04-18 07:10:17 +00:00 committed by Git OBS Bridge
parent da3cde8e63
commit 1b3494a786
2 changed files with 15 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Apr 18 02:55:54 UTC 2018 - mpost@suse.com
- Added /etc/chrony.d/ directory to the package (bsc#1083597)
Modifed default chrony.conf to add "include /etc/chrony.d/*"
-------------------------------------------------------------------
Mon Mar 26 17:30:07 CEST 2018 - kukuk@suse.de

View File

@ -28,7 +28,7 @@ Release: 0
Summary: System Clock Synchronization Client and Server
License: GPL-2.0-only
Group: Productivity/Networking/Other
URL: http://chrony.tuxfamily.org/
Url: http://chrony.tuxfamily.org/
Source: http://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz
Source2: chrony.sysconfig
Source3: chrony.dhclient
@ -106,6 +106,12 @@ sed -e 's|^\pool|! pool|' \
< examples/chrony.conf.example2 > chrony.conf
%endif
cat << EOF >> chrony.conf
# Also include any directives found in configuration files in /etc/chrony.d
include /etc/chrony.d/*.conf
EOF
touch -r examples/chrony.conf.example2 chrony.conf
# regenerate the file from getdate.y
@ -131,6 +137,7 @@ make %{?_smp_mflags} all docs
%make_install
install -Dpm 0644 chrony.conf \
%{buildroot}%{_sysconfdir}/chrony.conf
mkdir %{buildroot}%{_sysconfdir}/chrony.d
install -Dpm 0640 examples/chrony.keys.example \
%{buildroot}%{_sysconfdir}/chrony.keys
install -Dpm 0755 examples/chrony.nm-dispatcher \
@ -193,6 +200,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/
%config(noreplace) %attr(0640,root,%{name}) %verify(not md5 size mtime) %{_sysconfdir}/chrony.keys
%config(noreplace) %{_sysconfdir}/logrotate.d/chrony
%{_sysconfdir}/NetworkManager/dispatcher.d/20-chrony
%dir %{_sysconfdir}/chrony.d/
%dir %{_sysconfdir}/dhcp/
%dir %{_sysconfdir}/dhcp/dhclient.d/
%{_sysconfdir}/dhcp/dhclient.d/chrony.sh