From: Peter Wagner <tripolar@gmx.at>
Date: Tue, 2 Jan 2018 14:16:48 +0000 (+0100)
Subject: ntpd: *mimic the behaviour of the busybox ntpd's "-S" flag
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=04654291a4899bc69e2e8aca1bd4af9db0ed22aa;p=feed%2Fpackages.git

ntpd: *mimic the behaviour of the busybox ntpd's "-S" flag
*create a seperate line for every server, otherwise only the first listed server will be used
---

diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index ad3b5e715c..aafcb12233 100644
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ntp
 PKG_VERSION:=4.2.8p10
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 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.hotplug-helper b/net/ntpd/files/ntpd.hotplug-helper
index 555825c648..eacf4c55d3 100644
--- a/net/ntpd/files/ntpd.hotplug-helper
+++ b/net/ntpd/files/ntpd.hotplug-helper
@@ -1,13 +1,15 @@
 #!/bin/sh
 
+SLEEPTIME=10
+
 while true
 do
 	STATUS="$(/usr/sbin/ntpq -c 'rv 0 stratum'|awk -F '=' '{ print $2 }')"
 
-	if [ -n "$STATUS" ] && [ "$STATUS" -lt "16" ]
+	if [[ -n "$STATUS" && "$STATUS" -lt "16" ]]
 	then
 		ACTION="stratum" /sbin/hotplug-call ntp
-		exit 0
+		SLEEPTIME=660
 	fi
-	sleep 10
+	sleep $SLEEPTIME
 done
diff --git a/net/ntpd/files/ntpd.init b/net/ntpd/files/ntpd.init
index 0ed663750a..0aaf132a44 100644
--- a/net/ntpd/files/ntpd.init
+++ b/net/ntpd/files/ntpd.init
@@ -68,7 +68,10 @@ start_service() {
 		emit ""
 	fi
 
-	emit "server $server iburst"
+	for i in $server
+	do
+		emit "server $i iburst"
+	done
 
 	mkdir -p /var/lib/ntp
 	chown -R ntp:ntp /var/lib/ntp