From d5f7fbcf3f34a7fdf352584b53691c6f592808a5 Mon Sep 17 00:00:00 2001
From: Florian La Roche <laroche@redhat.com>
Date: Wed, 10 Jul 2002 10:14:28 +0000
Subject: - do not export GATEWAY in network-functions - code cleanups

---
 sysconfig/network-scripts/network-functions | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index c54be9a3..f0c4a08d 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -160,13 +160,11 @@ find_gateway_dev ()
 {
     . /etc/sysconfig/network
     if [ -n "${GATEWAY}" -a "${GATEWAY}" != "none" ] ; then
-	# XXX why?
-        export GATEWAY
 	dev=`LC_ALL=C /sbin/ip route | \
              grep ${GATEWAY} | \
              sed -e 's/.* dev \([:alnum:]*\)/\1/'`
 	if [ -n "$dev" ]; then
-	    GATEWAYDEV=$dev
+	    GATEWAYDEV="$dev"
         fi
     fi
 }
@@ -176,9 +174,8 @@ add_default_route ()
     . /etc/sysconfig/network
     check_default_route && return 0
     find_gateway_dev
-    if [ "$GATEWAYDEV" != "" -a \
-         "${GATEWAY}" != "" -a \
- 	 "${GATEWAY}" != "none" ] ; then
+    if [ "$GATEWAYDEV" != "" -a -n "${GATEWAY}" -a \
+ 		"${GATEWAY}" != "none" ]; then
         if ! check_device_down $1; then
             if [ "$GATEWAY" = "0.0.0.0" ]; then
                 /sbin/ip route add default dev ${GATEWAYDEV}
@@ -186,11 +183,9 @@ add_default_route ()
                 /sbin/ip route add default via ${GATEWAY}
             fi
         fi
-    else
-    	if [ -f /etc/default-route ]; then
-		/sbin/ip route add default via `cat /etc/default-route`
-		rm -f /etc/default-route
-	fi
+    elif [ -f /etc/default-route ]; then
+	/sbin/ip route add default via `cat /etc/default-route`
+	rm -f /etc/default-route
     fi
 }
 
-- 
cgit v1.2.1