SVN: rc-scripts/trunk/sysconfig/network-scripts/ifup-aliases

[baggins]

Author: baggins
Date: Tue Mar 10 12:33:51 2009
New Revision: 10196

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/ifup-aliases
Log:
- removed dead code


Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-aliases
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-aliases	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-aliases	Tue Mar 10 12:33:51 2009
@@ -7,9 +7,6 @@
 
 # Add all addresses
 for IP_ADDR in $IPADDR_ALIASES; do
-	IP_ADDR_OPT=""
-	IP_ROUTE_OPT=""
-
 	[ -z "$IP_ADDR" ] && continue
 	# Be sure that primary address is added
 	if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
@@ -18,18 +15,11 @@
 		fi
 	fi
 	if is_yes "${IPV4_NETWORKING}"; then
-		# If broadcast is missing then autocalculate it
-		if ! (echo $IP_ADDR_OPT | grep -qE "brd|broadcast"); then
-			IP_ADDR_OPT="brd + ${IP_ADDR_OPT}"
-		fi
-		ip -4 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
+		ip -4 addr add ${IP_ADDR} dev ${DEVICE} brd +
 	fi
 done
 
 for IP_ADDR in $IPV6_ADDR; do
-	IP_ADDR_OPT=""
-	IP_ROUTE_OPT=""
-
 	[ -z "$IP_ADDR" ] && continue
 	# Be sure that primary address is added
 	if [ "$IP_ADDR" = "$IP4ADDR" -o "$IP_ADDR" = "$IP6ADDR" ]; then
@@ -40,14 +30,10 @@
 	# Check for IPv6 address
 	if (echo $IP_ADDR | grep -q ":"); then
 		if is_yes "${IPV6_NETWORKING}"; then
-			ip -6 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
+			ip -6 addr add ${IP_ADDR} dev ${DEVICE}
 		fi
 	elif is_yes "${IPV4_NETWORKING}"; then
-		# If broadcast is missing then autocalculate it
-		if ! (echo $IP_ADDR_OPT | grep -qE "brd|broadcast"); then
-			IP_ADDR_OPT="brd + ${IP_ADDR_OPT}"
-		fi
-		ip -4 addr add ${IP_ADDR} dev ${DEVICE} ${IP_ADDR_OPT}
+		ip -4 addr add ${IP_ADDR} dev ${DEVICE} brd +
 	fi
 done