Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2022-02-19 16:02:28 +00:00
2 changed files with 3 additions and 1 deletions

View File

@@ -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