[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 01d89a24d3701e2aa79b0681a20ee64de3c899c4

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 01d89a24d3701e2aa79b0681a20ee64de3c899c4

[git]

[-- Attachment #1: Type: text/plain, Size: 2280 bytes --]

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, next has been updated
       via  01d89a24d3701e2aa79b0681a20ee64de3c899c4 (commit)
       via  3b1c776259eba53514c6fa4c120d919b7f3f365e (commit)
       via  949815f136a9b89fd4aca2cae7a0e216f4065088 (commit)
      from  fdc0944aa7125a536292e5d21973deda66ddab0f (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 01d89a24d3701e2aa79b0681a20ee64de3c899c4
Merge: fdc0944 3b1c776
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jun 1 15:43:48 2017 +0200

    Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes:
 make.sh                               | 2 +-
 src/initscripts/networking/dhcpcd.exe | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/make.sh b/make.sh
index 6585dd1..226d4dc 100755
--- 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 6c1391d..a2cdc66 100644
--- 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
 }


hooks/post-receive
--
IPFire 2.x development tree