From 2c930b8c9715e6f1b48ca6a0f27e916f247818e4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 28 Feb 2006 20:27:10 +0000 Subject: Fix potentials for endless loops when you have multiple devices that claim to have the same hardware address. (#177792, #182466) This happens most with hostap_cs and similar wireless drivers that have ethX/wlanX *and* wifiX. Do this by ignoring ieee802.11 links. Also, use /sbin/ip, not nameif - it gets confused in these cases as well. --- sysconfig/network-scripts/ifup-eth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sysconfig/network-scripts/ifup-eth') diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 2e7ca951..45efb881 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -40,7 +40,7 @@ is_available ${REALDEVICE} if [ -n "${HWADDR}" ]; then FOUNDMACADDR=`get_hwaddr ${REALDEVICE}` if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then - curdev=`ip -o link | awk -F ':' -vIGNORECASE=1 "/$HWADDR/ { print \\$2 }"` + curdev=`ip -o link | grep -v link/ieee802.11 | awk -F ': ' -vIGNORECASE=1 "/$HWADDR/ { print \\$2 }"` if [ -n "$curdev" ]; then rename_device "${REALDEVICE}" "${HWADDR}" "${curdev}" || { echo $"Device ${DEVICE} has different MAC address than expected, ignoring." -- cgit