diff options
author | Sam James (sam_c) <sam@cmpct.info> | 2020-04-19 20:54:06 +0000 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-05-02 12:43:27 +0200 |
commit | c3d88f854528be87d8bb689c5dc456a3aab2d64f (patch) | |
tree | 26a2498706649e9dc7f910f8cb976bc82d78c12d | |
parent | net-misc/chrony: Remove broken versions (diff) | |
download | gentoo-c3d88f85.tar.gz gentoo-c3d88f85.tar.bz2 gentoo-c3d88f85.zip |
net-misc/chrony: Fix paths to config file
OpenRC only; systemd unaffected by issue.
New "capsified" versions will use new config file, current stable
chrony now has a fixed file.
Revbump is complicated here given -r3, ..., already exists.
This should not have affected many users so this seems like
the simplest solution.
Closes: https://bugs.gentoo.org/719876
Signed-off-by: Sam James (sam_c) <sam@cmpct.info>
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r-- | net-misc/chrony/chrony-3.5-r4.ebuild | 2 | ||||
-rw-r--r-- | net-misc/chrony/chrony-4.0_pre1-r2.ebuild | 2 | ||||
-rw-r--r-- | net-misc/chrony/chrony-4.0_pre2-r1.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 |
6 files changed, 17 insertions, 5 deletions
diff --git a/net-misc/chrony/chrony-3.5-r4.ebuild b/net-misc/chrony/chrony-3.5-r4.ebuild index ae752af2fb58..a7a99b957db4 100644 --- a/net-misc/chrony/chrony-3.5-r4.ebuild +++ b/net-misc/chrony/chrony-3.5-r4.ebuild @@ -51,7 +51,7 @@ src_prepare() { doc/* examples/* || die # Copy for potential user fixup - cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf + cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf cp examples/chronyd.service "${T}"/chronyd.service # Set config for privdrop diff --git a/net-misc/chrony/chrony-4.0_pre1-r2.ebuild b/net-misc/chrony/chrony-4.0_pre1-r2.ebuild index c4c8a13c29a9..7cc61849d3d5 100644 --- a/net-misc/chrony/chrony-4.0_pre1-r2.ebuild +++ b/net-misc/chrony/chrony-4.0_pre1-r2.ebuild @@ -53,7 +53,7 @@ src_prepare() { doc/* examples/* || die # Copy for potential user fixup - cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf + cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf cp examples/chronyd.service "${T}"/chronyd.service # Set config for privdrop diff --git a/net-misc/chrony/chrony-4.0_pre2-r1.ebuild b/net-misc/chrony/chrony-4.0_pre2-r1.ebuild index 07017bb6772c..503840b27548 100644 --- a/net-misc/chrony/chrony-4.0_pre2-r1.ebuild +++ b/net-misc/chrony/chrony-4.0_pre2-r1.ebuild @@ -53,7 +53,7 @@ src_prepare() { doc/* examples/* || die # Copy for potential user fixup - cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf + cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf cp examples/chronyd.service "${T}"/chronyd.service # Set config for privdrop diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 543cabf61d5c..8d8758fa5c60 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -50,7 +50,7 @@ src_prepare() { doc/* examples/* || die # Copy for potential user fixup - cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf + cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf cp examples/chronyd.service "${T}"/chronyd.service # Set config for privdrop diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf index c04f3525f0b7..fc43a95c40fe 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="-u ntp -F 1" +ARGS="" diff --git a/net-misc/chrony/files/chronyd.conf-r1 b/net-misc/chrony/files/chronyd.conf-r1 new file mode 100644 index 000000000000..c04f3525f0b7 --- /dev/null +++ b/net-misc/chrony/files/chronyd.conf-r1 @@ -0,0 +1,12 @@ +# /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 1" |