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

[baggins]

Author: baggins
Date: Tue Mar 10 12:16:11 2009
New Revision: 10194

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/functions.network
Log:
- allow addrlabel setting for ipv4 adresses


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:16:11 2009
@@ -201,14 +201,15 @@
 	if [[ "${IP4ADDR}" = *:* ]]; then
 		IP6ADDR=${IP4ADDR}
 		IP4ADDR=""
-		eval IP6ADDRLABEL="\$IP_LABEL${IP6_PRIM_IF:-}"
 	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:-}"
 		eval IP6ADDROPT="\$IPV6_AOPTS${IP6_PRIM_IF:-}"
+		eval IP6ADDRLABEL="\$IP_LABEL${IP6_PRIM_IF:-}"
 	fi
 	if [ "${IP4_SRC_IF}" ] ; then
 		eval IP4SRCADDR="\$IPADDR${IP4_SRC_IF}"