From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 19 Aug 2008 14:09:57 +0000 (+0200)
Subject: Change the ip address removal at network stop
X-Git-Tag: v2.3-beta3~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70631572ba3fbf1e7ea83fc4e020081ecef3c4e3;p=people%2Fstevee%2Fipfire-2.x.git

Change the ip address removal at network stop
replace ifconfig with ip link at red for ATM-Bridge
---

diff --git a/src/initscripts/init.d/networking/any b/src/initscripts/init.d/networking/any
index dbd1cb22e8..b88d21ecf7 100644
--- a/src/initscripts/init.d/networking/any
+++ b/src/initscripts/init.d/networking/any
@@ -86,8 +86,8 @@ case "${1}" in
 		;;
 
 	stop)
-		boot_mesg "Removing IPv4 address ${ADDRESS} from the ${DEVICE} interface..."
-		ip addr del ${args} dev ${DEVICE}
+		boot_mesg "Removing IPv4 addresses from the ${DEVICE} interface..."
+		ip addr flush dev ${DEVICE}
 		evaluate_retval
 
 		# Disable vnstat collection
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 9bc848228a..57981a7e23 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -194,7 +194,7 @@ case "${1}" in
 				boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
 				br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
 				sleep 1
-				ifconfig $PPP_NIC up
+				ip link set ${PPP_NIC} up
 				TYPE="pppoe"
 			fi
 			if [ "$TYPE" == "pppoe" ]; then			
@@ -334,8 +334,8 @@ case "${1}" in
 			ip route del default via ${GATEWAY} >/dev/null 2>&1
 			echo_ok
 			if [ "$DEVICE" != "${GREEN_DEV}" ]; then
-				boot_mesg "Removing IPv4 address ${ADDRESS} from the ${DEVICE} interface..."
-				ip addr del ${args} dev ${DEVICE}
+				boot_mesg "Removing IPv4 addresses from the ${DEVICE} interface..."
+				ip addr flush dev ${DEVICE}
 				evaluate_retval
 			fi
 			run_subdir ${rc_base}/init.d/networking/red.down/