unbound: drop remove-dns-fowarders at red.down

this functions has only reloaded unbound config
which is useless at shutting down the red interface.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 34ea1433f05464d2df91160dcf19a40562d6e49c..3c8dfc70a51d333773bbd9ab390d549d83ac86c9 100644 (file)
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green
 etc/rc.d/init.d/networking/orange
 etc/rc.d/init.d/networking/red
 #etc/rc.d/init.d/networking/red.down
-etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
 etc/rc.d/init.d/networking/red.down/10-ipsec
 etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn

diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 34ea1433f05464d2df91160dcf19a40562d6e49c..3c8dfc70a51d333773bbd9ab390d549d83ac86c9 100644 (file)
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green
 etc/rc.d/init.d/networking/orange
 etc/rc.d/init.d/networking/red
 #etc/rc.d/init.d/networking/red.down
-etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
 etc/rc.d/init.d/networking/red.down/10-ipsec
 etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn

diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 9350b0e903abb98a3b255ebf25dd861807eaf249..3f56c49cc2cdea8ba92a1ef6cea5ff296ca03178 100644 (file)
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green
 etc/rc.d/init.d/networking/orange
 etc/rc.d/init.d/networking/red
 #etc/rc.d/init.d/networking/red.down
-etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
 etc/rc.d/init.d/networking/red.down/10-ipsec
 etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn

diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 9350b0e903abb98a3b255ebf25dd861807eaf249..3f56c49cc2cdea8ba92a1ef6cea5ff296ca03178 100644 (file)
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green
 etc/rc.d/init.d/networking/orange
 etc/rc.d/init.d/networking/red
 #etc/rc.d/init.d/networking/red.down
-etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
 etc/rc.d/init.d/networking/red.down/10-ipsec
 etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn

diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh
index bf63f58caf363e2eeb37f42afd79e345fbef633d..9a582915245fb5ba307e741075367953ff7d5b61 100644 (file)
--- a/config/rootfiles/core/142/update.sh
+++ b/config/rootfiles/core/142/update.sh
@@ -91,6 +91,9 @@ rm -rf /usr/lib/pppd/2.4.7
 /etc/init.d/squid stop
 /etc/init.d/suricata stop
 
+# drop unbound remove-forwarders
+rm -f /etc/rc.d/init.d/netowrking/red.down/05-remove-dns-forwarders
+
 # Extract files
 extract_files
 

diff --git a/src/initscripts/networking/red.down/05-remove-dns-forwarders b/src/initscripts/networking/red.down/05-remove-dns-forwarders
deleted file mode 100644 (file)
index 671cca9..0000000
--- a/src/initscripts/networking/red.down/05-remove-dns-forwarders
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Remove DNS forwarders for unbound
-exec /etc/init.d/unbound remove-forwarders

diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 0aab6cc8c100ae2fd2d379f638f1cf8880a884c5..c845c436f037cca1aca05959a7448b66ca248e80 100644 (file)
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -274,8 +274,6 @@ get_memory_amount() {
 }
 
 fix_time_if_dns_fails() {
-       # Sometimes the first try fails so do it twice
-       resolve "ping.ipfire.org" &>/dev/null
        # If DNS is working, everything is fine
        if resolve "ping.ipfire.org" &>/dev/null; then
                return 0
@@ -587,7 +585,7 @@ case "$1" in
                sleep 1
                $0 start
                ;;
-       reload|remove-forwarders|update-forwarders)
+       reload|update-forwarders)
                # Update configuration files
                write_forward_conf
                write_hosts_conf
@@ -595,10 +593,6 @@ case "$1" in
                # Call unbound-control and perform the reload
                /usr/sbin/unbound-control -q reload
 
-               if [ "$1" = "remove-forwarders" ]; then
-                       exit 0
-               fi
-
                # Dummy Resolve to wait for unbound
                resolve "ping.ipfire.org" &>/dev/null
 
@@ -617,16 +611,12 @@ case "$1" in
                statusproc /usr/sbin/unbound
                ;;
 
-               # Make sure DNS works at this point
-               fix_time_if_dns_fails
-               ;;
-
        resolve)
                resolve "${2}" || exit $?
                ;;
 
        *)
-               echo "Usage: $0 {start|stop|restart|reload|status|resolve|update-forwarders|remove-forwarders}"
+               echo "Usage: $0 {start|stop|restart|reload|status|resolve|update-forwarders}"
                exit 1
                ;;
 esac