From dfb8ca5fb5407de11942bc49bf0c2139b53b84a0 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Mon, 19 Nov 2001 10:04:22 +0000
Subject: set the ethernet number with nameif

---
 sysconfig/network-scripts/ifup | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 8b782ed4..94b7caad 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -92,21 +92,8 @@ is_available ${REALDEVICE} || {
       fi
 }
 if [ -n "${HWADDR}" ]; then
-    FOUNDMACADDR=`LC_ALL= LANG= ip -o link show ${REALDEVICE} | \
-	sed 's/.*link\/ether \([[:alnum:]:]*\).*/\1/'`
-    if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then
-        NEWCONFIG=`fgrep -l "HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*`
-	if [ -n "${NEWCONFIG}" ]; then
-	   exec /sbin/ifup ${NEWCONFIG}
-	fi
-        NEWCONFIG=`fgrep -l "HWADDR=${HWADDR}" /etc/sysconfig/networking/default/ifcfg-*`
-	if [ -n "${NEWCONFIG}" ]; then
-	   exec /sbin/ifup ${NEWCONFIG}
-	else
-	   echo $"Device ${DEVICE} has different MAC address than expected, ignoring."
-	   exit 1
-	fi
-    fi
+    # set the appropriate eth number
+    /sbin/nameif ${REALDEVICE} ${HWADDR}
 fi
 
 # is the device wireless? If so, configure wireless device specifics
-- 
cgit v1.2.1