aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec4
-rwxr-xr-xsysconfig/network-scripts/ifup-routes6
2 files changed, 7 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 72a50abb..80848143 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -247,6 +247,10 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Fri Jul 18 2003 Nalin Dahyabhai <nalin@redhat.com>
+- ifup-routes: pass the interface name to handle_file() so that we don't try
+ to use the routes file's name as an interface name
+
* Wed Jul 9 2003 Bill Nottingham <notting@redhat.com> 7.28-1
- switch from $CONFIG.keys to keys-$CONFIG
diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes
index 37bd2287..ee352193 100755
--- a/sysconfig/network-scripts/ifup-routes
+++ b/sysconfig/network-scripts/ifup-routes
@@ -15,7 +15,7 @@ handle_file () {
if [ "x$(eval echo '$'GATEWAY$routenum)x" != "xx" ]; then
line="$line via $(eval echo '$'GATEWAY$routenum)"
fi
- line="$line dev $1"
+ line="$line dev $2"
/sbin/ip route add $line
routenum=$(($routenum+1))
done
@@ -30,7 +30,7 @@ for file in $FILES; do
if [ -f "$file" ]; then
if egrep -q 'ADDRESS[0-9]+=' $file ; then
# new format
- handle_file $file
+ handle_file $file $1
else
# older format
while read line; do
@@ -44,4 +44,4 @@ done
# Red Hat network configuration format
NICK=${2:-$1}
CONFIG="/etc/sysconfig/network-scripts/$NICK.route"
-[ -f $CONFIG ] && handle_file $CONFIG
+[ -f $CONFIG ] && handle_file $CONFIG $1