From a15bfca2bcc473b162111e255778bf90200ec7f1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 12 Mar 2002 15:51:19 +0000 Subject: just use nameif instead of mucking with the other config files () --- sysconfig/network-scripts/ifup | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'sysconfig/network-scripts/ifup') diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 604757d3..219dcfde 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -95,17 +95,10 @@ 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}" -a "`basename ${NEWCONFIG}`" != "${CONFIG}" ]; then - exec /sbin/ifup ${NEWCONFIG} - fi - NEWCONFIG=`fgrep -l "HWADDR=${HWADDR}" /etc/sysconfig/networking/default/ifcfg-*` - if [ -n "${NEWCONFIG}" -a "`basename ${NEWCONFIG}`" != "${CONFIG}" ]; then - exec /sbin/ifup ${NEWCONFIG} - else + /sbin/nameif "${REALDEVICE}" "${HWADDR}" || { echo $"Device ${DEVICE} has different MAC address than expected, ignoring." exit 1 - fi + } fi fi -- cgit v1.2.1