aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-01-15 18:05:02 +0000
committerBill Nottingham <notting@redhat.com>2008-01-15 18:05:02 +0000
commit421351b381e0d073e3d690bf93e4c6f1a292dbc1 (patch)
treef4d5db2dea9571b72de50b123d09993f5c9a960d
parentfbfef504e077f4f6bfd065afea1d7547cfff785d (diff)
downloadinitscripts-421351b381e0d073e3d690bf93e4c6f1a292dbc1.tar
initscripts-421351b381e0d073e3d690bf93e4c6f1a292dbc1.tar.gz
initscripts-421351b381e0d073e3d690bf93e4c6f1a292dbc1.tar.bz2
initscripts-421351b381e0d073e3d690bf93e4c6f1a292dbc1.tar.xz
initscripts-421351b381e0d073e3d690bf93e4c6f1a292dbc1.zip
don't do something odd if we find a mac address that matches the
user-set MACADDR (#251415)
-rwxr-xr-xsysconfig/network-scripts/ifup-eth2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index a5e03f6a..3e2c1d47 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -45,7 +45,7 @@ is_available ${REALDEVICE}
# bail out, if the MAC does not fit
if [ -n "${HWADDR}" ]; then
FOUNDMACADDR=`get_hwaddr ${REALDEVICE}`
- if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then
+ if [ "${FOUNDMACADDR}" != "${HWADDR}" -a "${FOUNDMACADDR}" != "${MACADDR}" ]; then
curdev=`get_device_by_hwaddr ${HWADDR}`
if [ -n "$curdev" ]; then
rename_device "${REALDEVICE}" "${HWADDR}" "${curdev}" || {