aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2000-02-02 16:29:06 +0000
committerBill Nottingham <notting@redhat.com>2000-02-02 16:29:06 +0000
commit200bf4ec5eeef89505954132b2ba8275a4e8b2ae (patch)
treeafbc6a9d3fbf3df802e0e2bb15f4cbdf5f57c552
parent71100fe9451457e92974071dd96ee7c52e9a405f (diff)
downloadinitscripts-200bf4ec5eeef89505954132b2ba8275a4e8b2ae.tar
initscripts-200bf4ec5eeef89505954132b2ba8275a4e8b2ae.tar.gz
initscripts-200bf4ec5eeef89505954132b2ba8275a4e8b2ae.tar.bz2
initscripts-200bf4ec5eeef89505954132b2ba8275a4e8b2ae.tar.xz
initscripts-200bf4ec5eeef89505954132b2ba8275a4e8b2ae.zip
fix handling of bizarro linuxconf routes
-rwxr-xr-xrc.d/init.d/network5
-rwxr-xr-xsysconfig/network-scripts/ifup-routes5
2 files changed, 8 insertions, 2 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 3d3669f7..d6987e4a 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -64,8 +64,9 @@ case "$1" in
# Add non interface-specific static-routes.
if [ -f /etc/sysconfig/static-routes ]; then
- grep "^any" /etc/sysconfig/static-routes | while read ignore args; do
- /sbin/route add -$args
+ grep "^any" /etc/sysconfig/static-routes | while read ignore type dest netmask mask gw gateway; do
+ [ "${gateway}" != "${gateway##[0-9}" ] && \
+ /sbin/route add -$type $dest $netmask $mask $gw $gateway
done
fi
diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes
index bcd8ac3b..c96f947e 100755
--- a/sysconfig/network-scripts/ifup-routes
+++ b/sysconfig/network-scripts/ifup-routes
@@ -15,3 +15,8 @@ fi
grep "^$1 " /etc/sysconfig/static-routes | while read device args; do
/sbin/route add -$args $device
done
+grep "^any " /etc/sysconfig/static-routes | while read ignore type net netmask mask bogus dev ; do
+ if [ "$dev" = "$device" ]; then
+ /sbin/route add -$type $net $netmask $mask $dev
+ fi
+done