This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via ebf64a93ee01f18226a8ed465a188f976097ee34 (commit)
from 206113d39804f4bbdcf7b7983fc7b5fb9f89afc8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ebf64a93ee01f18226a8ed465a188f976097ee34
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 27 11:23:58 2017 +0100
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(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/111/filelists/files | 2 ++
src/initscripts/networking/dhcpcd.exe | 1 -
src/initscripts/networking/red | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/111/filelists/files b/config/rootfiles/core/111/filelists/files
index dbe65e2..f1e9746 100644
--- a/config/rootfiles/core/111/filelists/files
+++ b/config/rootfiles/core/111/filelists/files
@@ -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
diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe
index a2cdc66..6c1391d 100644
--- a/src/initscripts/networking/dhcpcd.exe
+++ b/src/initscripts/networking/dhcpcd.exe
@@ -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
}
diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 00e739c..20567ce 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -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
hooks/post-receive
--
IPFire 2.x development tree