| 1 |
commit: 0038ac68924daa03d33752def494681c14c8bb41 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 5 09:23:55 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 5 09:29:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0038ac68 |
| 7 |
|
| 8 |
net-misc/chrony: Fix /etc/conf.d/chronyd for USE=-caps |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 11 |
Closes: https://bugs.gentoo.org/740418 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
net-misc/chrony/chrony-3.5.1-r1.ebuild | 2 +- |
| 15 |
net-misc/chrony/chrony-4.0_pre3.ebuild | 2 +- |
| 16 |
net-misc/chrony/chrony-9999.ebuild | 2 +- |
| 17 |
net-misc/chrony/files/chronyd.conf | 2 +- |
| 18 |
net-misc/chrony/files/chronyd.conf-r1 | 12 ------------ |
| 19 |
5 files changed, 4 insertions(+), 16 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild |
| 22 |
index 38bd1ccc1f0..9a2af1bd3ea 100644 |
| 23 |
--- a/net-misc/chrony/chrony-3.5.1-r1.ebuild |
| 24 |
+++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild |
| 25 |
@@ -68,7 +68,7 @@ src_prepare() { |
| 26 |
-e 's|pkg-config|${PKG_CONFIG}|g' \ |
| 27 |
configure || die |
| 28 |
|
| 29 |
- cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die |
| 30 |
+ cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die |
| 31 |
} |
| 32 |
|
| 33 |
src_configure() { |
| 34 |
|
| 35 |
diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild |
| 36 |
index 25ae917e91e..b5c97cbbd86 100644 |
| 37 |
--- a/net-misc/chrony/chrony-4.0_pre3.ebuild |
| 38 |
+++ b/net-misc/chrony/chrony-4.0_pre3.ebuild |
| 39 |
@@ -68,7 +68,7 @@ src_prepare() { |
| 40 |
-e 's|pkg-config|${PKG_CONFIG}|g' \ |
| 41 |
configure || die |
| 42 |
|
| 43 |
- cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die |
| 44 |
+ cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die |
| 45 |
} |
| 46 |
|
| 47 |
src_configure() { |
| 48 |
|
| 49 |
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild |
| 50 |
index 25ae917e91e..b5c97cbbd86 100644 |
| 51 |
--- a/net-misc/chrony/chrony-9999.ebuild |
| 52 |
+++ b/net-misc/chrony/chrony-9999.ebuild |
| 53 |
@@ -68,7 +68,7 @@ src_prepare() { |
| 54 |
-e 's|pkg-config|${PKG_CONFIG}|g' \ |
| 55 |
configure || die |
| 56 |
|
| 57 |
- cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die |
| 58 |
+ cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die |
| 59 |
} |
| 60 |
|
| 61 |
src_configure() { |
| 62 |
|
| 63 |
diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf |
| 64 |
index fc43a95c40f..d017660d599 100644 |
| 65 |
--- a/net-misc/chrony/files/chronyd.conf |
| 66 |
+++ b/net-misc/chrony/files/chronyd.conf |
| 67 |
@@ -9,4 +9,4 @@ CFGFILE="/etc/chrony/chrony.conf" |
| 68 |
# The combination of "-s -r" allows chronyd to perform long term averaging of |
| 69 |
# the gain or loss rate across system reboots and shutdowns. |
| 70 |
|
| 71 |
-ARGS="" |
| 72 |
+ARGS=" -u ntp -F 0" |
| 73 |
|
| 74 |
diff --git a/net-misc/chrony/files/chronyd.conf-r1 b/net-misc/chrony/files/chronyd.conf-r1 |
| 75 |
deleted file mode 100644 |
| 76 |
index 2783f29e684..00000000000 |
| 77 |
--- a/net-misc/chrony/files/chronyd.conf-r1 |
| 78 |
+++ /dev/null |
| 79 |
@@ -1,12 +0,0 @@ |
| 80 |
-# /etc/conf.d/chronyd |
| 81 |
- |
| 82 |
-CFGFILE="/etc/chrony/chrony.conf" |
| 83 |
- |
| 84 |
-# Configuration dependant options : |
| 85 |
-# -s - Set system time from RTC if rtcfile directive present |
| 86 |
-# -r - Reload sample histories if dumponexit directive present |
| 87 |
-# |
| 88 |
-# The combination of "-s -r" allows chronyd to perform long term averaging of |
| 89 |
-# the gain or loss rate across system reboots and shutdowns. |
| 90 |
- |
| 91 |
-ARGS="-u ntp -F 0" |
Archives