From d9d2e42410e211e180a5ebbb968a1df32077f457 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 22 Jan 2010 15:36:22 -0500
Subject: If HWADDR is set and DEVICE is not, use HWADDR to determine DEVICE.
 (#545597)

---
 sysconfig/network-scripts/network-functions | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index e1c0d6fa..ccb4da59 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -105,6 +105,13 @@ source_config ()
 		DEVICETYPE="sit"
 		;;
     esac
+    if [ -n "$HWADDR" ]; then
+        HWADDR=$(echo $HWADDR | awk '{ print toupper($0) }')
+    fi
+    if [ -n "$MACADDR" ]; then
+        MACADDR=$(echo $MACADDR | awk '{ print toupper($0) }')
+    fi
+    [ -z "$DEVICE" -a -n "$HWADDR" ] && DEVICE=$(get_device_by_hwaddr $HWADDR)
     [ -z "$DEVICETYPE" ] && DEVICETYPE=$(echo ${DEVICE} | sed "s/[0-9]*$//")
     [ -z "$REALDEVICE" -a -n "$PARENTDEVICE" ] && REALDEVICE=$PARENTDEVICE
     [ -z "$REALDEVICE" ] && REALDEVICE=${DEVICE%%:*}
@@ -113,12 +120,6 @@ source_config ()
     else
 	ISALIAS=no
     fi
-    if [ -n "$HWADDR" ]; then
-        HWADDR=$(echo $HWADDR | awk '{ print toupper($0) }')
-    fi
-    if [ -n "$MACADDR" ]; then
-        MACADDR=$(echo $MACADDR | awk '{ print toupper($0) }')
-    fi
 }
 
 
-- 
cgit v1.2.1