diff options
author | Bill Nottingham <notting@redhat.com> | 1999-02-10 17:52:31 +0000 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 1999-02-10 17:52:31 +0000 |
commit | f85f47e701fcf4a9692010caeb452d7e4e248a2f (patch) | |
tree | 989c7f8c0d5cbab16fe50ab48bafd5fa33287018 | |
parent | 919f0d045a80761f637ff39a356aaa31a586ede1 (diff) | |
download | initscripts-f85f47e701fcf4a9692010caeb452d7e4e248a2f.tar initscripts-f85f47e701fcf4a9692010caeb452d7e4e248a2f.tar.gz initscripts-f85f47e701fcf4a9692010caeb452d7e4e248a2f.tar.bz2 initscripts-f85f47e701fcf4a9692010caeb452d7e4e248a2f.tar.xz initscripts-f85f47e701fcf4a9692010caeb452d7e4e248a2f.zip |
fix kernel-2.2 double net routes, remove '-x' from ifdhcpc-done
-rw-r--r-- | sysconfig/network-scripts/ifdhcpc-done | 2 | ||||
-rwxr-xr-x | 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} |