SVN: rc-scripts/trunk/sysconfig/network-scripts: functions.network ifup

[baggins]

Author: baggins
Date: Tue Mar 10 12:39:10 2009
New Revision: 10198

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/functions.network
   rc-scripts/trunk/sysconfig/network-scripts/ifup
Log:
- addlabel is IPv6 only


Modified: rc-scripts/trunk/sysconfig/network-scripts/functions.network
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/functions.network	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/functions.network	Tue Mar 10 12:39:10 2009
@@ -204,7 +204,6 @@
 	else
 		eval IP4ADDROPT="\$IP_AOPTS${IP4_PRIM_IF:-}"
 		eval IP4ROUTEOPT="\$IP_ROPTS${IP4_PRIM_IF:-}"
-		eval IP4ADDRLABEL="\$IP_LABEL${IP4_PRIM_IF:-}"
 	fi
 	if [ "${IP6_PRIM_IF}" ] ; then
 		eval IP6ADDR="\$IPADDR${IP6_PRIM_IF:-}"

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup	Tue Mar 10 12:39:10 2009
@@ -191,9 +191,6 @@
 		else
 			ip addr add ${IP4ADDR} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
 		fi
-		if [ -n "${IP4ADDRLABEL}" ]; then
-			ip addrlabel add prefix ${IP4ADDR} dev ${DEVICE} label ${IP4ADDRLABEL}
-		fi
 	fi
 
 	# Set device up