diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-08-05 13:29:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 13:29:20 -0700 |
| commit | 8b004dbfbaaa085a19e42e38f2237e6333225a05 (patch) | |
| tree | dee7fc2a846c5072e39d617f79f447309a4c5101 /net | |
| parent | 1be8f072c83c8dcaf6f5a6fa0f73181bd4e1ad65 (diff) | |
| parent | 86a2e8f67174a817c1ea9ee90c4a8f75e6f100c6 (diff) | |
Merge pull request #12811 from TDT-AG/pr/20200714-ntpd
ntpd: add config include support
Diffstat (limited to 'net')
| -rw-r--r-- | net/ntpd/Makefile | 2 | ||||
| -rw-r--r-- | net/ntpd/files/ntpd.init | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile index 6ac9e311d..ff82af24c 100644 --- 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 0f0f57700..73ffb78d9 100644 --- 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 |