Author: baggins
Date: Tue Mar 10 12:11:05 2009
New Revision: 10193
Modified:
rc-scripts/trunk/sysconfig/network-scripts/functions.network
Log:
- remove IP6_SRC_IF dead code
- started adding IP_LABEL
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:11:05 2009
@@ -201,6 +201,7 @@
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:-}"
@@ -213,10 +214,6 @@
eval IP4SRCADDR="\$IPADDR${IP4_SRC_IF}"
IP4SRCADDR=$(echo ${IP4SRCADDR} | awk ' { gsub(/\/.*/,NIL);
print "src " $0; } ')
fi
- if [ "${IP6_SRC_IF}" ] ; then
- eval IP6SRCADDR="\$IPADDR${IP6_SRC_IF}"
- IP6SRCADDR=$(echo ${IP6SRCADDR} | awk ' { gsub(/\/.*/,NIL);
print "src " $0; } ')
- fi
# new rc-scripts 0.4.x option
if [ -z "$HANDLING" ]; then
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
