Merge commit 'origin/master' into kernel-update

config/rootfiles/core/57/filelists/files

@@ -2,3 +2,4 @@ etc/system-release
 etc/issue
 etc/rc.d/init.d/networking/red.up/10-static-routes
 etc/rc.d/init.d/networking/red.down/10-static-routes
+etc/rc.d/init.d/networking/any

make.sh

@@ -26,7 +26,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.11"							# Version number
 CORE="57"							# Core Level (Filename)
-PAKFIRE_CORE="56"						# Core Level (PAKFIRE)
+PAKFIRE_CORE="57"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir

src/initscripts/init.d/networking/any

@@ -80,15 +80,19 @@ case "${1}" in
 		# Create & Enable vnstat data collection
 		/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
 		
-		boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..."
-		ip addr add ${args} dev ${DEVICE}
-		evaluate_retval
+		if [ ! "${ADDRESS}" == "1.1.1.1" ]; then
+			boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..."
+			ip addr add ${args} dev ${DEVICE}
+			evaluate_retval
+		fi
 		;;
 
 	stop)
-		boot_mesg "Removing IPv4 addresses from the ${DEVICE} interface..."
-		ip addr flush dev ${DEVICE}
-		evaluate_retval
+		if [ ! "${ADDRESS}" == "1.1.1.1" ]; then
+			boot_mesg "Removing IPv4 addresses from the ${DEVICE} interface..."
+			ip addr flush dev ${DEVICE}
+			evaluate_retval
+		fi
 
 		# Disable vnstat collection
 		/usr/bin/vnstat -u -i ${DEVICE}	-r --disable > /dev/null 2>&1