From 9f38f0eeba5d63c36e910cde44b9bc59c2b5aba3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 24 Jun 2003 04:13:19 +0000 Subject: more tweaks - encapsulate grabing the hw addr into its own function - normalize case of all hwaddrs - if we are passed a device with no config, see if there's a config for that hwaddr --- sysconfig/network-scripts/ifup | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sysconfig/network-scripts/ifup') diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index ba649c12..13232704 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -141,8 +141,7 @@ is_available ${REALDEVICE} # remap, if the device is bound with a MAC address and not the right device num # bail out, if the MAC does not fit if [ -n "${HWADDR}" ]; then - FOUNDMACADDR=`LC_ALL= LANG= ip -o link show ${REALDEVICE} 2>/dev/null| \ - sed 's/.*link\/ether \([[:alnum:]:]*\).*/\1/'` + FOUNDMACADDR=`get_hwaddr ${REALDEVICE}` if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then /sbin/nameif "${REALDEVICE}" "${HWADDR}" || { echo $"Device ${DEVICE} has different MAC address than expected, ignoring." -- cgit v1.2.1