Fix shutting down unbound when red is STATIC

Unbound was trying to check availability of the upstream name servers
when /var/ipfire/red/active is present. This patch removes it first
and then brings down the red device.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-05-27 11:23:58 +01:00
parent 206113d398
commit ebf64a93ee
3 changed files with 4 additions and 2 deletions

View File

@@ -1,5 +1,7 @@
etc/system-release
etc/issue
etc/rc.d/init.d/networking/dhcpcd.exe
etc/rc.d/init.d/networking/red
etc/rc.d/init.d/wlanclient
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ipinfo.cgi

View File

@@ -79,7 +79,6 @@ dhcpcd_down()
# Only if RED_TYPE=DHCP update /var/ipfire/red
if [ "$RED_TYPE" == "DHCP" ]; then
logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down"
rm -f /var/ipfire/red/active
run_subdir ${rc_base}/init.d/networking/red.down/
fi
}

View File

@@ -457,6 +457,8 @@ case "${1}" in
;;
stop)
rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
if [ "$TYPE" == "STATIC" ]; then
boot_mesg "Stopping default gateway ${GATEWAY}..."
ip route del default via ${GATEWAY} >/dev/null 2>&1
@@ -521,7 +523,6 @@ case "${1}" in
## Disable vnstat collection
/usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1
rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
exit 0;
;;
esac