From 3471bd66f89a36e1638f59500876f3810b7425d3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 21 Aug 2002 21:20:13 +0000
Subject: use the other file redhat-config-network writes by default; leave
 route-<foo> for user customization (<pbrown@redhat.com>, others)

---
 sysconfig/network-scripts/ifup-routes | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes
index 657aa661..f6734375 100755
--- a/sysconfig/network-scripts/ifup-routes
+++ b/sysconfig/network-scripts/ifup-routes
@@ -1,22 +1,31 @@
 #! /bin/bash
 #
 # adds static routes which go through device $1
-
 if [ -z "$1" ]; then
     echo $"usage: ifup-routes <net-device>"
     exit 1
 fi
 
-[ -f "/etc/sysconfig/network-scripts/route-$1" ] || exit 0
+CONFIG="/etc/sysconfig/networking/devices/$1.route"
+[ -f $CONFIG ] || exit 0
+
+. $CONFIG
+
+# Red Hat network configuration format
 
+routenum=0
+while [ "x$(eval echo '$'ADDRESS$routenum)x" != "xx" ]; do
+    eval `ipcalc -p $(eval echo '$'ADDRESS$routenum) $(eval echo '$'NETMASK$routenum)`
+    line="$(eval echo '$'ADDRESS$routenum)/$PREFIX"
+    if [ "x$(eval echo '$'GATEWAY$routenum)x" != "xx" ]; then
+	line="$line via $(eval echo '$'GATEWAY$routenum)"
+    fi
+    line="$line dev $1"
+    /sbin/ip route add $line
+    routenum=$(($routenum+1))
+done
+
+# Older format
 while read line; do
     /sbin/ip route add $line
 done < "/etc/sysconfig/network-scripts/route-$1"
-
-# XXX old version:
-#grep "^$1[[:space:]]" /etc/sysconfig/static-routes | while read device args; do
-#	/sbin/route add -$args $device
-#done
-#grep "^any[[:space:]]" /etc/sysconfig/static-routes | while read ignore args ; do
-#        /sbin/route add -$args
-#done
-- 
cgit v1.2.1