From c1217e6aab0e4feaf8a54de8aeeb53730bf40c96 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 19 Mar 1999 23:01:59 +0000
Subject: set macaddr before bootp

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

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 7b86ca68..71b47881 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -77,6 +77,10 @@ if [ "$SLAVE" = yes -a "$ISALIAS" = no -a "$MASTER" != "" -a \
     exit 0
 fi
 
+if [ -n "$MACADDR" ]; then
+   ifconfig ${DEVICE} hw ether ${MACADDR}
+fi
+
 if [ -n "$PUMP" ]; then
     echo -n "Determing IP information for $DEVICE..."
     if /sbin/pump -i $DEVICE ; then
@@ -98,8 +102,7 @@ else
 	eval `/bin/ipcalc --network ${IPADDR} ${NETMASK}`
     fi
 
-    ifconfig ${DEVICE} ${MACADDR:+hw ether $MACADDR} ${IPADDR} \
-      netmask ${NETMASK} broadcast ${BROADCAST}
+    ifconfig ${DEVICE} ${IPADDR} netmask ${NETMASK} broadcast ${BROADCAST}
     # don't re-add subnet route on 2.2 kernels, but add a route
     # to a non-local subnet.
     # stupid hack, but it should work
-- 
cgit v1.2.1