From 02c573742e6c4bed7d712ff124b74042ed585797 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 7 Dec 2006 18:43:12 +0000
Subject: back out... save for 5.1

---
 sysconfig/network-scripts/ifup-eth | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 84500851..7c94e310 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -96,16 +96,6 @@ if [ -n "${BRIDGE}" -a -x /usr/sbin/brctl ]; then
       exit 0
 fi 
 
-# this isn't the same as the MAC in the configuration filename.  It is
-# available as a configuration option in the config file, forcing the kernel
-# to think an ethernet card has a different MAC address than it really has.
-if [ -n "${MACADDR}" ]; then
-   ip link set dev ${DEVICE} address ${MACADDR}
-fi
-if [ -n "${MTU}" ]; then
-   ip link set dev ${DEVICE} mtu ${MTU}
-fi
-
 # slave device?
 if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then
     /sbin/ip link set dev ${DEVICE} down
@@ -139,6 +129,16 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
     done
 fi
 
+# this isn't the same as the MAC in the configuration filename.  It is
+# available as a configuration option in the config file, forcing the kernel
+# to think an ethernet card has a different MAC address than it really has.
+if [ -n "${MACADDR}" ]; then
+   ip link set dev ${DEVICE} address ${MACADDR}
+fi
+if [ -n "${MTU}" ]; then
+   ip link set dev ${DEVICE} mtu ${MTU}
+fi
+
 		     
 if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then
     # Remove any temporary references which were previously added to dhclient config
-- 
cgit v1.2.1