From d99bc57ea7ddfc0069e475ff3120543bc56fc528 Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Sun, 5 Nov 2023 01:49:29 +0100
Subject: [PATCH] [no ci] Overlay: move ntpd query to udhcpc (#1106)

---
 general/overlay/etc/init.d/S49ntpd              | 1 -
 general/overlay/usr/share/udhcpc/default.script | 2 ++
 general/package/busybox/busybox.config          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/general/overlay/etc/init.d/S49ntpd b/general/overlay/etc/init.d/S49ntpd
index dac84858..0caf7eb7 100755
--- a/general/overlay/etc/init.d/S49ntpd
+++ b/general/overlay/etc/init.d/S49ntpd
@@ -16,7 +16,6 @@ start() {
 	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- $NTPD_ARGS
 	status=$?
 	if [ "$status" -eq 0 ]; then
-		ntpd -q -N -n -d
 		echo "OK"
 	else
 		echo "FAIL"
diff --git a/general/overlay/usr/share/udhcpc/default.script b/general/overlay/usr/share/udhcpc/default.script
index 2127b61f..925137f9 100755
--- a/general/overlay/usr/share/udhcpc/default.script
+++ b/general/overlay/usr/share/udhcpc/default.script
@@ -101,6 +101,8 @@ case "$1" in
 			echo adding dns $i
 			echo "nameserver $i" >> $RESOLV_CONF
 		done
+
+		ntpd -q -N -n
 		;;
 esac
 
diff --git a/general/package/busybox/busybox.config b/general/package/busybox/busybox.config
index 6f249076..f4a2d65e 100644
--- a/general/package/busybox/busybox.config
+++ b/general/package/busybox/busybox.config
@@ -1030,7 +1030,7 @@ CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_FEATURE_UDHCP_RFC3397=y
 CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-x hostname:$(hostname) -A 0 -T 1 -t 1 -R -b -O search"
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-x hostname:$(hostname) -A 0 -R -b -O search"
 
 #
 # Print Utilities