Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 1 Jun 2017 13:43:48 +0000 (15:43 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 1 Jun 2017 13:43:48 +0000 (15:43 +0200)
make.sh
src/initscripts/networking/dhcpcd.exe

diff --git a/make.sh b/make.sh
index 6585dd1..226d4dc 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
index 6c1391d..a2cdc66 100644 (file)
@@ -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
 }