[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3b45d9561b6d30d9491419a2022f2befaf2b2f4a

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3b45d9561b6d30d9491419a2022f2befaf2b2f4a

[Arne Fitzenreiter]

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  3b45d9561b6d30d9491419a2022f2befaf2b2f4a (commit)
       via  2ecb2784625f597c676533f63859b49e416f53a1 (commit)
      from  926d840faeafe9528532f42aa12a0922188c1959 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3b45d9561b6d30d9491419a2022f2befaf2b2f4a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Feb 19 15:53:54 2022 +0000

    core164: add unbound initskript
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 2ecb2784625f597c676533f63859b49e416f53a1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Feb 19 09:22:06 2022 +0100

    unbound: fix dns working check
    
    pool.ipfire.org cannot resolved. Now try both default dns
    servers. If one works dns is working.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/164/filelists/files | 1 +
 src/initscripts/system/unbound            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/164/filelists/files b/config/rootfiles/core/164/filelists/files
index 278dc20a6..89118ae62 100644
--- a/config/rootfiles/core/164/filelists/files
+++ b/config/rootfiles/core/164/filelists/files
@@ -3,6 +3,7 @@ etc/rc.d/init.d/firewall
 etc/rc.d/init.d/leds
 etc/rc.d/init.d/partresize
 etc/rc.d/init.d/squid
+etc/rc.d/init.d/unbound
 etc/suricata/suricata.yaml
 etc/sysctl.conf
 opt/pakfire/lib/functions.pl
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 1b42ac720..b959520a1 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -267,7 +267,8 @@ get_memory_amount() {
 
 fix_time_if_dns_fails() {
 	# If DNS is working, everything is fine
-	if resolve "ipfire.pool.ntp.org" &>/dev/null; then
+	if resolve "0.ipfire.pool.ntp.org" &>/dev/null || \
+	   resolve "1.ipfire.pool.ntp.org" &>/dev/null ; then
 		return 0
 	fi
 


hooks/post-receive
--
IPFire 2.x development tree