Accepting request 687330 from network:time

- Fix ordering and dependencies of chronyd.service, so that it is
  started after name resolution is up (bsc#1129914).
- Add chrony-service-ordering.patch
- Fix location of helper script in chrony-dnssrv@.service
  (bsc#1128846).

OBS-URL: https://build.opensuse.org/request/show/687330
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/chrony?expand=0&rev=19
This commit is contained in:
2019-03-22 13:55:39 +00:00
committed by Git OBS Bridge
4 changed files with 27 additions and 1 deletions

View File

@@ -5,4 +5,4 @@ Wants=network-online.target
[Service]
Type=oneshot
ExecStart=/usr/share/chrony-helper update-dnssrv-servers %I
ExecStart=/usr/lib/chrony/helper update-dnssrv-servers %I

View File

@@ -0,0 +1,15 @@
--- examples/chronyd.service.orig
+++ examples/chronyd.service
@@ -1,7 +1,11 @@
[Unit]
Description=NTP client/server
Documentation=man:chronyd(8) man:chrony.conf(5)
-After=ntpdate.service sntp.service ntpd.service
+After=nss-lookup.target
+Wants=network.target
+After=network.target
+Wants=time-sync.target
+Before=time-sync.target
Conflicts=ntpd.service systemd-timesyncd.service
ConditionCapability=CAP_SYS_TIME

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Mar 21 13:35:20 UTC 2019 - Reinhard Max <max@suse.com>
- Fix ordering and dependencies of chronyd.service, so that it is
started after name resolution is up (bsc#1129914).
- Add chrony-service-ordering.patch
- Fix location of helper script in chrony-dnssrv@.service
(bsc#1128846).
-------------------------------------------------------------------
Wed Mar 6 13:40:04 UTC 2019 - Martin Pluskal <mpluskal@suse.com>

View File

@@ -45,6 +45,7 @@ Patch0: chrony-config.patch
# Add NTP servers from DHCP when starting service
Patch1: chrony-service-helper.patch
Patch2: chrony-logrotate.patch
Patch3: chrony-service-ordering.patch
BuildRequires: NetworkManager-devel
BuildRequires: bison
BuildRequires: gcc-c++
@@ -95,6 +96,7 @@ or a different computer.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3
# If this is an openSUSE build, use our vendor zone
# (2.*pool.ntp.org names include IPv6 addresses). If not