- Read runtime servers from /var/run/netconfig/chrony.servers to

fix bsc#1099272.
- Move chrony-helper to /usr/lib/chrony/helper, because there
  should be no executables in /usr/share.

OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=62
This commit is contained in:
Reinhard Max 2018-12-20 17:43:50 +00:00 committed by Git OBS Bridge
parent 7da09593f3
commit ab0c0bf492
4 changed files with 12 additions and 4 deletions

View File

@ -4,7 +4,7 @@
PIDFile=/var/run/chrony/chronyd.pid
EnvironmentFile=-/etc/sysconfig/chronyd
ExecStart=/usr/sbin/chronyd $OPTIONS
+ExecStartPost=/usr/share/chrony-helper update-daemon
+ExecStartPost=/usr/lib/chrony/chrony-helper update-daemon
PrivateTmp=yes
ProtectHome=yes
ProtectSystem=full

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Dec 20 16:48:14 UTC 2018 - Reinhard Max <max@suse.com>
- Read runtime servers from /var/run/netconfig/chrony.servers to
fix bsc#1099272.
- Move chrony-helper to /usr/lib/chrony/helper, because there
should be no executables in /usr/share.
-------------------------------------------------------------------
Fri Dec 14 08:05:35 UTC 2018 - Martin Pluskal <mpluskal@suse.com>

View File

@ -9,7 +9,7 @@ helper_dir=/var/run/chrony-helper
added_servers_file=$helper_dir/added_servers
network_sysconfig_file=/etc/sysconfig/network
dhclient_servers_files=/var/lib/dhclient/chrony.servers.*
dhclient_servers_files=/var/run/netconfig/chrony.servers
dnssrv_servers_files=$helper_dir/dnssrv@*
dnssrv_timer_prefix=chrony-dnssrv@

View File

@ -170,7 +170,7 @@ echo 'chronyd.service' > \
install -Dpm 0644 %{SOURCE2} \
%{buildroot}%{_fillupdir}/sysconfig.chrony
install -Dpm 755 %{SOURCE4} \
%{buildroot}%{_datadir}/chrony-helper
%{buildroot}%{_libexecdir}/%name/helper
install -d %{buildroot}%{_localstatedir}/log/chrony
touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc}
@ -214,7 +214,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/
%{_sysconfdir}/dhcp/dhclient.d/chrony.sh
%{_bindir}/chronyc
%{_sbindir}/chronyd
%{_datadir}/chrony-helper
%{_libexecdir}/%name
%{_mandir}/man1/chronyc.1%{?ext_man}
%{_mandir}/man5/chrony.conf.5%{?ext_man}
%{_mandir}/man8/chronyd.8%{?ext_man}