aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2006-11-20 22:07:41 +0000
committerBill Nottingham <notting@redhat.com>2006-11-20 22:07:41 +0000
commit092e6f1869ab877b1116acb8083c9e3508b3c195 (patch)
treec9e84f86e0fbbff18ef940ae8f1d0d8567d0d64f
parentb17ded48cd5f1d5e23b378d94a75ca6626509d43 (diff)
downloadinitscripts-092e6f1869ab877b1116acb8083c9e3508b3c195.tar
initscripts-092e6f1869ab877b1116acb8083c9e3508b3c195.tar.gz
initscripts-092e6f1869ab877b1116acb8083c9e3508b3c195.tar.bz2
initscripts-092e6f1869ab877b1116acb8083c9e3508b3c195.tar.xz
initscripts-092e6f1869ab877b1116acb8083c9e3508b3c195.zip
- ifup: fix actual 169.254 networks (#203591)
-rw-r--r--initscripts.spec1
-rwxr-xr-xsysconfig/network-scripts/ifup2
2 files changed, 2 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec
index edfbb21b..52c9da37 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -217,6 +217,7 @@ rm -rf $RPM_BUILD_ROOT
- ifdown: run ifenslave -d on bonding devices (#199706)
- init.d/halt: don't try to unmount network mounts (#200915)
- ifdown, ifup-aliases: fix static routes for aliases (#202948)
+- ifup: fix actual 169.254 networks (#203591)
* Fri Apr 21 2006 Miloslav Trmac <mitr@redhat.com> - 7.93.25.EL-1
- Document HOTPLUG (#189509)
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index be400a30..03c76047 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -445,7 +445,7 @@ if [ "${TYPE}" = "Bonding" ] || ethtool -i $DEVICE 2>/dev/null| grep -q "driver
fi
# Add Zeroconf route.
-if [ -z "${NOZEROCONF}" -a "${ISALIAS}" = "no" ]; then
+if [ -z "${NOZEROCONF}" -a "${ISALIAS}" = "no" -a "${REALDEVICE}" != "lo" ]; then
ip route replace 169.254.0.0/16 dev ${REALDEVICE}
fi