From 4912889cbc00cfe36945c7d57f8c15acf1f45333 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 15 Jan 2008 18:06:38 +0000
Subject: don't do something odd if we find a mac address that matches the
 user-set MACADDR (#251415)

---
 sysconfig/network-scripts/ifup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index a1a8eff3..2f8257b2 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -158,7 +158,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=`ip -o link | awk -F ':' -vIGNORECASE=1 "/$HWADDR/ { print \\$2 }"`
         [ -n "$curdev" ] && rename_device "${REALDEVICE}" "${HWADDR}" "${curdev}" || {
 	    echo $"Device ${DEVICE} has different MAC address than expected, ignoring."
-- 
cgit