From 9262352718c703c976eb4a94b0783dd18815a80c Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 17 Mar 2004 02:42:34 +0000
Subject: fix some of the MACADDR/HWADDR conflicts (#110427)

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

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index ce8f2110..7aa852ca 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -49,7 +49,7 @@ fi
 # Check to make sure the device is actually up
 check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "bootp" ] && [ -n "$VLAN" -a "$VLAN" != "yes" ] && exit 0
 
-if [ -n "${HWADDR}" ]; then
+if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then
     FOUNDMACADDR=`get_hwaddr ${REALDEVICE}`
     if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then
         NEWCONFIG=`fgrep -il "HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*`
-- 
cgit v1.2.1