[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. eb17d0fd69ae2c21becfee831b32d3441ec6652c

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3611 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  eb17d0fd69ae2c21becfee831b32d3441ec6652c (commit)
       via  fa4762fbf8732a1e48015ee07a422f293d7be1f7 (commit)
      from  36661efeecd3f3e0d1bb46cc65aa5f696b18f649 (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 eb17d0fd69ae2c21becfee831b32d3441ec6652c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Feb 19 12:51:12 2012 +0100

    finished core57.

commit fa4762fbf8732a1e48015ee07a422f293d7be1f7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Feb 19 12:48:42 2012 +0100

    network: don't set ip address "1.1.1.1".
    
    This change made also green-only with dhcp possible.
    configure green to 1.1.1.1 and red to dhcp client and RED_DEV=green0.

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

Summary of changes:
 config/rootfiles/core/57/filelists/files |    1 +
 make.sh                                  |    2 +-
 src/initscripts/init.d/networking/any    |   16 ++++++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/57/filelists/files b/config/rootfiles/core/57/filelists/files
index a678ee8..2f80b5f 100644
--- a/config/rootfiles/core/57/filelists/files
+++ b/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
diff --git a/make.sh b/make.sh
index f425428..598681d 100755
--- a/make.sh
+++ b/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
diff --git a/src/initscripts/init.d/networking/any b/src/initscripts/init.d/networking/any
index b88d21e..5609a9e 100644
--- a/src/initscripts/init.d/networking/any
+++ b/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


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