From e1a383cdd476a6ca51756c3ea3d610970e6a09773baa4617fab674baa10f4677 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 19 Mar 2019 15:55:11 +0000 Subject: [PATCH] - Fix ordering and dependencies of chronyd.service, so that it is not being started before the network (bsc#1129730). - Add chrony-service-ordering.patch OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=67 --- chrony-service-ordering.patch | 15 +++++++++++++++ chrony.changes | 7 +++++++ chrony.spec | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 chrony-service-ordering.patch diff --git a/chrony-service-ordering.patch b/chrony-service-ordering.patch new file mode 100644 index 0000000..5df1e6d --- /dev/null +++ b/chrony-service-ordering.patch @@ -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 + diff --git a/chrony.changes b/chrony.changes index eaf3cd6..b2a12f9 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 19 11:08:11 UTC 2019 - Reinhard Max + +- Fix ordering and dependencies of chronyd.service, so that it is + not being started before the network (bsc#1129730). +- Add chrony-service-ordering.patch + ------------------------------------------------------------------- Wed Mar 6 13:40:04 UTC 2019 - Martin Pluskal diff --git a/chrony.spec b/chrony.spec index 684f08f..6dfe8c8 100644 --- a/chrony.spec +++ b/chrony.spec @@ -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