Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2017-06-01 15:43:48 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -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

View 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
}