unbound: run "time-fix" before savesearch resolves
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Mar 2020 18:41:14 +0000 (19:41 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Mar 2020 19:46:26 +0000 (19:46 +0000)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
src/initscripts/system/unbound

index 507f589..7bf2ffc 100644 (file)
@@ -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
                ;;