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

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

(limited to 'sysconfig/network-scripts/ifup-eth')

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}" || {
-- 
cgit v1.2.1