aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts/ifup
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2001-07-24 20:47:06 +0000
committerBill Nottingham <notting@redhat.com>2001-07-24 20:47:06 +0000
commit2604a03f2105ed34bdd08817ee91bb653a478bf0 (patch)
treeae9dc8b6d2b29290f1455ec7869b5ffa0ccf4392 /sysconfig/network-scripts/ifup
parentee673429a7dae3de798f97ec323ea2530c22348e (diff)
downloadinitscripts-2604a03f2105ed34bdd08817ee91bb653a478bf0.tar
initscripts-2604a03f2105ed34bdd08817ee91bb653a478bf0.tar.gz
initscripts-2604a03f2105ed34bdd08817ee91bb653a478bf0.tar.bz2
initscripts-2604a03f2105ed34bdd08817ee91bb653a478bf0.tar.xz
initscripts-2604a03f2105ed34bdd08817ee91bb653a478bf0.zip
do config expansion (NETMASK, PREFIX, etc) in a function, call it from ifdown (fixes #49777, #49783)
Diffstat (limited to 'sysconfig/network-scripts/ifup')
-rwxr-xr-xsysconfig/network-scripts/ifup16
1 files changed, 1 insertions, 15 deletions
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) \