[PATCH 2/4] unbound: run "time-fix" before savesearch resolves

[Arne Fitzenreiter <arne_f@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 1191 bytes --]

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
 src/initscripts/system/unbound | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 507f589ca..7bf2ffc2c 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -587,7 +587,7 @@ case "$1" in
 		sleep 1
 		$0 start
 		;;
-	reload|remove-forwarders)
+	reload|remove-forwarders|update-forwarders)
 		# Update configuration files
 		write_forward_conf
 		write_hosts_conf
@@ -595,6 +595,14 @@ case "$1" in
 		# Call unbound-control and perform the reload
 		/usr/sbin/unbound-control -q reload
 
+		# Dummy Resolve to wait for unbound
+		resolve "ping.ipfire.org" &>/dev/null
+
+		if [ "$1" = "update-forwarders" ]; then
+			# Make sure DNS works at this point
+			fix_time_if_dns_fails
+		fi
+
 		# Update Safe Search rules if the system is online.
 		if [ -e "/var/ipfire/red/active" ]; then
 			update_safe_search
@@ -605,9 +613,6 @@ case "$1" in
 		statusproc /usr/sbin/unbound
 		;;
 
-	update-forwarders)
-		$0 reload
-
 		# Make sure DNS works at this point
 		fix_time_if_dns_fails
 		;;
-- 
2.17.1