From 3b5131c1a3416c9c9aef1365d3787abea197d37d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 2 Mar 2020 17:54:48 +0000 Subject: [PATCH] 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 --- config/rootfiles/common/aarch64/initscripts | 1 - config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/common/x86_64/initscripts | 1 - config/rootfiles/core/142/update.sh | 3 +++ .../networking/red.down/05-remove-dns-forwarders | 4 ---- src/initscripts/system/unbound | 14 ++------------ 7 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 src/initscripts/networking/red.down/05-remove-dns-forwarders diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 34ea1433f0..3c8dfc70a5 100644 --- 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 34ea1433f0..3c8dfc70a5 100644 --- 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 9350b0e903..3f56c49cc2 100644 --- 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 9350b0e903..3f56c49cc2 100644 --- 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 bf63f58caf..9a58291524 100644 --- 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 index 671cca9df5..0000000000 --- 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 0aab6cc8c1..c845c436f0 100644 --- 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 -- 2.39.2