aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2002-03-12 15:51:19 +0000
committerBill Nottingham <notting@redhat.com>2002-03-12 15:51:19 +0000
commita15bfca2bcc473b162111e255778bf90200ec7f1 (patch)
tree370ee5eed94e36a539568c3cb20946bb0796209b /sysconfig
parent3c8bf819778831e628467c5d5f4727240c588229 (diff)
downloadinitscripts-a15bfca2bcc473b162111e255778bf90200ec7f1.tar
initscripts-a15bfca2bcc473b162111e255778bf90200ec7f1.tar.gz
initscripts-a15bfca2bcc473b162111e255778bf90200ec7f1.tar.bz2
initscripts-a15bfca2bcc473b162111e255778bf90200ec7f1.tar.xz
initscripts-a15bfca2bcc473b162111e255778bf90200ec7f1.zip
just use nameif instead of mucking with the other config files (<harald@redhat.com>)
Diffstat (limited to 'sysconfig')
-rwxr-xr-xsysconfig/network-scripts/ifup11
1 files changed, 2 insertions, 9 deletions
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