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, next has been updated via a74bf13cbbe0521411675767e7c41a29f37d151a (commit) via 3b45d9561b6d30d9491419a2022f2befaf2b2f4a (commit) via 2ecb2784625f597c676533f63859b49e416f53a1 (commit) via 926d840faeafe9528532f42aa12a0922188c1959 (commit) via 5c1af49c835921232a0312819025fb08dddae4b3 (commit) from 954828d8f3ee6d8b5754c648b31e43c2c7667291 (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 a74bf13cbbe0521411675767e7c41a29f37d151a Merge: 954828d8f 3b45d9561 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Feb 19 16:02:28 2022 +0000

Merge branch 'master' into next

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

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

Difference in files: diff --git a/config/rootfiles/oldcore/164/filelists/files b/config/rootfiles/oldcore/164/filelists/files index 278dc20a6..89118ae62 100644 --- a/config/rootfiles/oldcore/164/filelists/files +++ b/config/rootfiles/oldcore/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 1005c14d1..04e43fbce 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -282,7 +282,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