Merge branch 'master' into next

diff --git a/make.sh b/make.sh
index 6585dd13a1a1a11d9b62625b2539690e71569cba..226d4dcd0bcf00e2947be7c9f3e07d74f0d58a7b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
 CORE="111"                                                     # Core Level (Filename)
-PAKFIRE_CORE="110"                                             # Core Level (PAKFIRE)
+PAKFIRE_CORE="111"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir

diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe
index 6c1391d71f2d6c6f3a73136684ac5a2160a200c7..a2cdc66d257404c57cdad5013cda247bbfcbe751 100644 (file)
--- a/src/initscripts/networking/dhcpcd.exe
+++ b/src/initscripts/networking/dhcpcd.exe
@@ -79,6 +79,7 @@ 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
 }