aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--initscripts.spec2
-rwxr-xr-xsysconfig/network-scripts/ifup2
-rwxr-xr-xsysconfig/network-scripts/ifup-aliases2
4 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ebdd8ee..04902606 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-06-01 Bill Nottingham <notting@redhat.com>
+ * rc.d/rc.sysinit:
+ conf.modules -> modules.conf
+
* sysconfig/network-scripts/ifup-aliases:
don't add duplicate default routes for aliases
diff --git a/initscripts.spec b/initscripts.spec
index ae1e656d..18d54ded 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -9,7 +9,7 @@ BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15, console-tools
Requires: procps >= 2.0.6-5, sysklogd >= 1.3.31
Requires: setup >= 2.0.3, /sbin/fuser, which
-Requires: modutils >= 2.1.121
+Requires: modutils >= 2.3.11-5
%ifarch alpha
Requires: util-linux >= 2.9w-26
%endif
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 12d7d520..b9e9357c 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -117,8 +117,6 @@ else
# stupid hack, but it should work
if [ "$ISALIAS" = no ] && [ -z "`route -n | sed "s/ .*//" | grep ${NETWORK}`" ]; then
route add -net ${NETWORK} netmask ${NETMASK} dev ${DEVICE}
- elif [ "$ISALIAS" != no ]; then
- route add -host ${IPADDR} ${DEVICE}
fi
# this is broken! it's only here for compatibility with old RH systems
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 239c9775..88cb3c34 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -254,8 +254,6 @@ function new_interface ()
if [ "$NO_ALIASROUTING" != yes ]; then
- route add -host ${IPADDR} ${DEVICE}
-
# this is broken! it's only here for compatibility with old RH systems
if [ "${GATEWAY}" != "" -a "${GATEWAY}" != "none" ]; then
route add default gw ${GATEWAY} metric 1 ${DEVICE}