From b8c0e37b001e95fdacb1940b07575497e27e4b46 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 22 Jan 2007 18:41:56 +0000
Subject: [PATCH] ifup-{aliases,routes,neigh} are now sourced instead of
 executed

svn-id: @8188
---
 sysconfig/network-scripts/ifup-aliases | 23 -----------------------
 sysconfig/network-scripts/ifup-neigh   | 26 +-------------------------
 sysconfig/network-scripts/ifup-post    |  6 +++---
 sysconfig/network-scripts/ifup-routes  | 26 +-------------------------
 4 files changed, 5 insertions(+), 76 deletions(-)

diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 6c384eec..2d9aa2d4 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -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=""
diff --git a/sysconfig/network-scripts/ifup-neigh b/sysconfig/network-scripts/ifup-neigh
index 3f8e77a3..00a60007 100755
--- a/sysconfig/network-scripts/ifup-neigh
+++ b/sysconfig/network-scripts/ifup-neigh
@@ -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
diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index e9a9260c..c82c7463 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -52,9 +52,9 @@ if [ -n "${BANDWIDTH_IN}" ]; then
 	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
diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes
index 03d64cfc..8097b2d8 100755
--- a/sysconfig/network-scripts/ifup-routes
+++ b/sysconfig/network-scripts/ifup-routes
@@ -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
-- 
2.44.0