From 2251d2bc0f100d99d8ca73a392c52130dac66b65 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 25 May 2005 16:21:08 +0000
Subject: fix interface renaming (#158774)

---
 sysconfig/network-scripts/ifup-eth | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 63b1e1e3..1e712b2d 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -39,12 +39,14 @@ is_available ${REALDEVICE}
 # bail out, if the MAC does not fit
 if [ -n "${HWADDR}" ]; then
     FOUNDMACADDR=`get_hwaddr ${REALDEVICE}`
-    if [ -n "${FOUNDMACADDR}" -a "${FOUNDMACADDR}" != "${HWADDR}" ]; then
+    if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then
         curdev=`ip -o link | awk -F ':' -vIGNORECASE=1 "/$HWADDR/ { print \\$2 }"`
-        [ -n "$curdev" ] && rename_device "${REALDEVICE}" "${HWADDR}" "${curdev}" || {
+        if [ -n "$curdev" ]; then
+	  rename_device "${REALDEVICE}" "${HWADDR}" "${curdev}" || {
 	    echo $"Device ${DEVICE} has different MAC address than expected, ignoring."
 	    exit 1
-	}
+	  }
+	fi
     fi
 fi
 
-- 
cgit v1.2.1