From f85f47e701fcf4a9692010caeb452d7e4e248a2f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 10 Feb 1999 17:52:31 +0000
Subject: fix kernel-2.2 double net routes, remove '-x' from ifdhcpc-done

---
 sysconfig/network-scripts/ifdhcpc-done | 2 +-
 sysconfig/network-scripts/ifup         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sysconfig/network-scripts/ifdhcpc-done b/sysconfig/network-scripts/ifdhcpc-done
index 8abc5cb1..5444f105 100644
--- a/sysconfig/network-scripts/ifdhcpc-done
+++ b/sysconfig/network-scripts/ifdhcpc-done
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 SLEEPPIDFILE=/var/run/dhcp-wait-${IFNAME}.pid
 
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index f59b99e5..11635eee 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -135,7 +135,8 @@ if [ "$IPSETUP" != yes ]; then
 
     ifconfig ${DEVICE} ${MACADDR:+hw ether $MACADDR} ${IPADDR} \
       netmask ${NETMASK} broadcast ${BROADCAST}
-    if [ "$ISALIAS" = no ] ; then
+    # stupid hack, but it should work
+    if [ "$ISALIAS" = no ] && [ ! -f "/proc/sys/kernel/modprobe" ] ; then
 	route add -net ${NETWORK} netmask ${NETMASK} ${DEVICE}
     else
 	route add -host ${IPADDR} ${DEVICE}
-- 
cgit v1.2.1