diff options
| author | Henrik Riomar <henrik.riomar@gmail.com> | 2020-11-11 20:52:02 +0100 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2020-11-13 08:02:14 +0000 |
| commit | 77984a660882c983894079887469727390089aff (patch) | |
| tree | 0059fdec2a0d7c34cfcac081d5e49d7da561c122 | |
| parent | afdb8042d778aae2e1f5ed096d788d94205ff4b0 (diff) | |
main/chrony: fix vrf support
chronyd init.d overrides start(), due to this the built in vrf support
in openrc does not work. Due to this chronyd init.d must handle the
vrf support.
| -rw-r--r-- | main/chrony/APKBUILD | 6 | ||||
| -rw-r--r-- | main/chrony/chronyd.confd | 3 | ||||
| -rw-r--r-- | main/chrony/chronyd.initd | 8 |
3 files changed, 13 insertions, 4 deletions
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD index dff4132ce65..6965268ccc2 100644 --- a/main/chrony/APKBUILD +++ b/main/chrony/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=chrony pkgver=4.0 -pkgrel=0 +pkgrel=1 pkgdesc="NTP client and server programs" url="https://chrony.tuxfamily.org" pkgusers="$pkgname" @@ -83,7 +83,7 @@ package() { sha512sums="a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9 chrony-4.0.tar.gz 067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch -0490770cc214b4ccf76470420e0b33e6c41ad16344d6503973a28346b002e2cee441e9ae982be1a8f21696da26f436f2ce36a5201e9628becb83bad3487d9170 chronyd.confd -5c1a36a4a5f3d7b76c0042c70ff066664a0e2926fff66ce6c0fdcefbc4b70a8b23f660fec59eea45d3c90628bd9a1db7c5d34bbf2b5786d4c6cd9311538b8b6c chronyd.initd +c1ce577ed1af9f3d88a6a2880a4834ae0c6a7f45870d9396d2aacd7716eb8de346ce458e1a45fdd48b1e8b8f5cd3afcba9534ac47fedb517604c9d910a342fac chronyd.confd +1501161812ad12679d47a1b671d2ddbe94ec5825d5e225729057abc3b8869cb813acd8bdd7adaba0cd786afdf04280228e327a3b83f89a11d06bf3cb826c5269 chronyd.initd 663c6316bcca762de119d88e4bb6536bfe0fea19939fe1b673900847619e7f1d6783b789b38ebba97b5dc3778dedf798bafd65f00f8bd7e312bfed7df0caaf71 chrony.conf eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048 timepps.h" diff --git a/main/chrony/chronyd.confd b/main/chrony/chronyd.confd index 1d13bf64aeb..02856d1d486 100644 --- a/main/chrony/chronyd.confd +++ b/main/chrony/chronyd.confd @@ -15,3 +15,6 @@ FAST_STARTUP=no # the gain or loss rate across system reboots and shutdowns. ARGS="" + +# vrf e.g 'vrf-mgmt' +#vrf="" diff --git a/main/chrony/chronyd.initd b/main/chrony/chronyd.initd index 1b8b9a42af2..e6ad293dd60 100644 --- a/main/chrony/chronyd.initd +++ b/main/chrony/chronyd.initd @@ -54,6 +54,12 @@ start() { checkconfig || return $? setxtrarg + # If we are configured to run in a VRF, provide a hint for that + RC_VRF_EXEC="" + if [ -n "$vrf" ]; then + RC_VRF_EXEC="/sbin/ip vrf exec $vrf" + fi + local daemon_args= if yesno "$FAST_STARTUP"; then ARGS="${ARGS} -n" @@ -61,7 +67,7 @@ start() { fi ebegin "Starting chronyd" - start-stop-daemon $daemon_args --start --quiet \ + eval ${RC_VRF_EXEC} start-stop-daemon $daemon_args --start --quiet \ --exec "${command}" \ --pidfile "${pidfile}" \ -- -f "${CFGFILE}" ${ARGS} |