ntpd: add config include support

Signed-off-by: Florian Eckert <redacted>

diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index 6ac9e311d292aa0220147134dd0870b4d4f7e3ee..ff82af24c439fbb7ad091df507c68b612c7efac9 100644 (file)
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ntp
 PKG_VERSION:=4.2.8p15
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/

diff --git a/net/ntpd/files/ntpd.init b/net/ntpd/files/ntpd.init
index 0f0f57700703684797aad9523843ed316a4ce4af..73ffb78d951c2a7ded26857587101ecbbbf86f71 100644 (file)
--- a/net/ntpd/files/ntpd.init
+++ b/net/ntpd/files/ntpd.init
@@ -75,6 +75,20 @@ start_ntpd_instance() {
                emit "server $i iburst"
        done
 
+       if [ -d "/etc/ntpd.d" ]; then
+               local entry
+               for entry in "/etc/ntpd.d"/*.conf; do
+                       emit "includefile ${entry}\n"
+               done
+       fi
+
+       if [ -d "/tmp/ntpd.d" ]; then
+               local entry
+               for entry in "/tmp/ntpd.d"/*.conf; do
+                       emit "includefile ${entry}\n"
+               done
+       fi
+
        mkdir -p /var/lib/ntp
        chown -R ntp:ntp /var/lib/ntp