diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2020-09-05 11:23:55 +0200 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2020-09-05 11:29:12 +0200 |
| commit | 0038ac68924daa03d33752def494681c14c8bb41 (patch) | |
| tree | 04eff36cf61d9d71b8ebbe754fee0cc763c1b48a | |
| parent | dev-util/cgdb: https:// in HOMEPAGE (diff) | |
| download | gentoo-0038ac68924daa03d33752def494681c14c8bb41.tar.gz gentoo-0038ac68924daa03d33752def494681c14c8bb41.tar.bz2 gentoo-0038ac68924daa03d33752def494681c14c8bb41.zip | |
net-misc/chrony: Fix /etc/conf.d/chronyd for USE=-caps
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Closes: https://bugs.gentoo.org/740418
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
| -rw-r--r-- | net-misc/chrony/chrony-3.5.1-r1.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/chrony/chrony-4.0_pre3.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/chrony/chrony-9999.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/chrony/files/chronyd.conf | 2 | ||||
| -rw-r--r-- | net-misc/chrony/files/chronyd.conf-r1 | 12 |
5 files changed, 4 insertions, 16 deletions
diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild index 38bd1ccc1f01..9a2af1bd3eab 100644 --- a/net-misc/chrony/chrony-3.5.1-r1.ebuild +++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild @@ -68,7 +68,7 @@ src_prepare() { -e 's|pkg-config|${PKG_CONFIG}|g' \ configure || die - cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die } src_configure() { diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild index 25ae917e91e9..b5c97cbbd863 100644 --- a/net-misc/chrony/chrony-4.0_pre3.ebuild +++ b/net-misc/chrony/chrony-4.0_pre3.ebuild @@ -68,7 +68,7 @@ src_prepare() { -e 's|pkg-config|${PKG_CONFIG}|g' \ configure || die - cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die } src_configure() { diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 25ae917e91e9..b5c97cbbd863 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -68,7 +68,7 @@ src_prepare() { -e 's|pkg-config|${PKG_CONFIG}|g' \ configure || die - cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die } src_configure() { diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf index fc43a95c40fe..d017660d5998 100644 --- a/net-misc/chrony/files/chronyd.conf +++ b/net-misc/chrony/files/chronyd.conf @@ -9,4 +9,4 @@ CFGFILE="/etc/chrony/chrony.conf" # The combination of "-s -r" allows chronyd to perform long term averaging of # the gain or loss rate across system reboots and shutdowns. -ARGS="" +ARGS=" -u ntp -F 0" diff --git a/net-misc/chrony/files/chronyd.conf-r1 b/net-misc/chrony/files/chronyd.conf-r1 deleted file mode 100644 index 2783f29e6844..000000000000 --- a/net-misc/chrony/files/chronyd.conf-r1 +++ /dev/null @@ -1,12 +0,0 @@ -# /etc/conf.d/chronyd - -CFGFILE="/etc/chrony/chrony.conf" - -# Configuration dependant options : -# -s - Set system time from RTC if rtcfile directive present -# -r - Reload sample histories if dumponexit directive present -# -# The combination of "-s -r" allows chronyd to perform long term averaging of -# the gain or loss rate across system reboots and shutdowns. - -ARGS="-u ntp -F 0" |