aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-09-27 17:48:16 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-09-27 17:49:19 +0000
commit5ba959bf43bef497d4256c4201890f473bc7b601 (patch)
tree4be3cfb5e363b814c47a50b3a1f981d2c645a273 /main
parenta358ff96b686062d752ea238199ee0c8ba46040b (diff)
downloadaports-5ba959bf43bef497d4256c4201890f473bc7b601.tar.bz2
aports-5ba959bf43bef497d4256c4201890f473bc7b601.tar.xz
main/dhcpcd: fix chrony.conf location
fix dhcpcd to look for chrony.conf in /etc/chrony
Diffstat (limited to 'main')
-rw-r--r--main/dhcpcd/APKBUILD4
-rw-r--r--main/dhcpcd/fix-chrony-conf-location.patch13
2 files changed, 17 insertions, 0 deletions
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 659faa3d2b..8c33128272 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -15,6 +15,7 @@ install=""
subpackages="$pkgname-doc"
source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.xz
busybox-logger.patch
+ fix-chrony-conf-location.patch
dhcpcd.initd
"
@@ -43,10 +44,13 @@ package() {
md5sums="d4f2f3ed4964197dee7767219c33a9df dhcpcd-6.11.3.tar.xz
231d2b03e7e93fa6cc7406889e9945e3 busybox-logger.patch
+3445d2e63c1401a705b34f6142fbe71e fix-chrony-conf-location.patch
5cd5809d11b77b30f21df8418729d70b dhcpcd.initd"
sha256sums="5abd12c4df2947d608f60a35227f9bf8ae8ab9de06ce975cdab1144d8f229b06 dhcpcd-6.11.3.tar.xz
aec6c5d7a41551ca7cd3849a53621692ee0a1a6d259892beaf448eb1f2d4af01 busybox-logger.patch
+08dd172591ec4698f28059e4c692c3ca2fe9ed4d13244be05860813b8ba5c6af fix-chrony-conf-location.patch
6bb9b8b0075e45e63e898ed043f3c5951dc3e95c1fa62d22cc6e0616c792ecd1 dhcpcd.initd"
sha512sums="249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70 dhcpcd-6.11.3.tar.xz
83dc7bfd36b6b416c931775bb35a0d2951ed04c421195c45bfed80a11a7adbed7c80ade1c1246847c2fb1bf15a7b6e83100f16605ee84f750440d7bc9f7f5ef3 busybox-logger.patch
+4e07c886d89aa4962e683383098d343030a24838e3c3d86ac79c00aad87dcaf41352ac04556a2bf0e00c1b9bad370351e254e83fa76f6e299102fd292b5f6a70 fix-chrony-conf-location.patch
6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde dhcpcd.initd"
diff --git a/main/dhcpcd/fix-chrony-conf-location.patch b/main/dhcpcd/fix-chrony-conf-location.patch
new file mode 100644
index 0000000000..4fcde0d475
--- /dev/null
+++ b/main/dhcpcd/fix-chrony-conf-location.patch
@@ -0,0 +1,13 @@
+diff --git a/dhcpcd-hooks/50-ntp.conf b/dhcpcd-hooks/50-ntp.conf
+index 7480503..94b11bb 100644
+--- a/dhcpcd-hooks/50-ntp.conf
++++ b/dhcpcd-hooks/50-ntp.conf
+@@ -17,7 +17,7 @@
+ # above examples.
+
+ : ${ntp_confs:=ntp.conf ntpd.conf chrony.conf}
+-: ${ntp_conf_dirs=/etc /usr/pkg/etc /usr/local/etc}
++: ${ntp_conf_dirs=/etc /etc/chrony /usr/pkg/etc /usr/local/etc}
+ ntp_conf_dir="$state_dir/ntp.conf"
+
+ # If NTP_CONF is not set, work out a good default