SVN: rc-scripts/trunk/sysconfig/network-scripts: ifup-aliases ifup-neigh ifup-post ifup-routes

[glen]

Author: glen
Date: Mon Jan 22 19:41:56 2007
New Revision: 8188

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/ifup-aliases
   rc-scripts/trunk/sysconfig/network-scripts/ifup-neigh
   rc-scripts/trunk/sysconfig/network-scripts/ifup-post
   rc-scripts/trunk/sysconfig/network-scripts/ifup-routes
Log:
ifup-{aliases,routes,neigh} are now sourced instead of executed

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	Mon Jan 22 19:41:56 2007
@@ -4,29 +4,6 @@
 #
 # adds all addresses of device $1
 
-. /etc/sysconfig/network
-. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
-
-# device name must be ifcfg-somename
-DEV=$1
-
-[ -z "$DEV" ] && {
-	nls "Usage: %s <device name>" "ifup-aliases" >&2
-	exit 1
-}
-
-if [ -f "/etc/sysconfig/interfaces/ifcfg-$DEV" ] ; then
-	CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
-else
-	CONFIG="$DEV"
-fi
-
-source_config
-
-# set all major variables
-setup_ip_param
-
 # Add all addresses
 for IP_ADDR in $IPADDR_ALIASES; do
 	IP_ADDR_OPT=""

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-neigh
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-neigh	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-neigh	Mon Jan 22 19:41:56 2007
@@ -4,34 +4,10 @@
 #
 # adds static arps for device $DEVICE
 
-. /etc/sysconfig/network
-. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
-
-DEV=$1
-
-if [ -z "$DEV" ]; then
-	nls "Usage: %s <device name>" "ifup-neigh" >&2
-	exit 1
-fi
-
 if [ ! -f /etc/sysconfig/static-arp ]; then
-	exit 0
+	return
 fi
 
-if [ -f "/etc/sysconfig/interfaces/ifcfg-$DEV" ] ; then
-	CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
-else
-	CONFIG="$DEV"
-fi
-
-source_config
-
-# set all major variables
-setup_ip_param
-
-get_ppp_device_and_pid
-
 # note the trailing white space character in the grep gets rid of aliases
 egrep "^($DEVICE|any)[[:blank:]]" /etc/sysconfig/static-arp | while read iface mac ip state args; do
 	if is_no "$IPV4_NETWORKING"; then

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-post
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-post	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-post	Mon Jan 22 19:41:56 2007
@@ -52,9 +52,9 @@
 	tc filter add dev ${REALDEVICE} parent ffff: protocol ip prio 50 u32 match ip src 0.0.0.0/0 police rate ${BANDWIDTH_IN}kbit burst 10k drop flowid :3
 fi
 
-/etc/sysconfig/network-scripts/ifup-aliases ${CONFIG}
-/etc/sysconfig/network-scripts/ifup-routes ${CONFIG}
-/etc/sysconfig/network-scripts/ifup-neigh ${CONFIG}
+. /etc/sysconfig/network-scripts/ifup-aliases
+. /etc/sysconfig/network-scripts/ifup-routes
+. /etc/sysconfig/network-scripts/ifup-neigh
 
 # don't set hostname on ppp/slip connections
 if [ -n "$NEEDHOSTNAME" -a "${DEVICETYPE}" != "ppp" -a "${DEVICETYPE}" != "slip" ]; then

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-routes
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-routes	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-routes	Mon Jan 22 19:41:56 2007
@@ -4,34 +4,10 @@
 #
 # adds static routes which go through device $DEVICE
 
-. /etc/sysconfig/network
-. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
-
-DEV=$1
-
-if [ -z "$DEV" ]; then
-	nls "Usage: %s <device name>" "ifup-routes" >&2
-	exit 1
-fi
-
 if [ ! -f /etc/sysconfig/static-routes ]; then
-	exit 0
+	return
 fi
 
-if [ -f "/etc/sysconfig/interfaces/ifcfg-$DEV" ] ; then
-	CONFIG="/etc/sysconfig/interfaces/ifcfg-$DEV"
-else
-	CONFIG="$DEV"
-fi
-
-source_config
-
-# set all major variables
-setup_ip_param
-
-get_ppp_device_and_pid
-
 # note the trailing white space character in the grep gets rid of aliases
 egrep "^($DEVICE|any)[[:blank:]]" /etc/sysconfig/static-routes | while read device args; do
 	if (echo $args | grep -q ":") then