From 2604a03f2105ed34bdd08817ee91bb653a478bf0 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 24 Jul 2001 20:47:06 +0000
Subject: do config expansion (NETMASK, PREFIX, etc) in a function, call it
 from ifdown (fixes #49777, #49783)

---
 sysconfig/network-scripts/ifup | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'sysconfig/network-scripts/ifup')

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index fa155f71..2f61aca1 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -181,21 +181,7 @@ else
 	 exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2}
     fi
   
-    if [ -z "${NETMASK}" ]; then
-	eval `/bin/ipcalc --netmask ${IPADDR}`
-    fi
-
-    if [ -z "${PREFIX}" ]; then
-	eval `/bin/ipcalc --prefix ${IPADDR} ${NETMASK}`
-    fi
-
-    if [ -z "${BROADCAST}" ]; then
-	eval `/bin/ipcalc --broadcast ${IPADDR} ${NETMASK}`
-    fi
-
-    if [ -z "${NETWORK}" ]; then
-	eval `/bin/ipcalc --network ${IPADDR} ${NETMASK}`
-    fi
+    expand_config
     
     [ -n "${ARP}${PROMISC}${ALLMULTI}" ] && \
 	ip link set ${DEVICE} $(toggle_value arp $ARP) \
-- 
cgit v1.2.1