Merge branch 'master' into next

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

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