diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-06-25 11:40:18 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-06-25 11:40:18 -0400 |
| commit | dd41384829d3448d9b71cd1c2d8048a9201e5003 (patch) | |
| tree | dd6a6c685fc7cc25ecc3fb170968708ab8f5690c | |
| parent | 7c3b2f31b455343ee78b052a1b350005f27c5d24 (diff) | |
| download | initscripts-dd41384829d3448d9b71cd1c2d8048a9201e5003.tar.gz initscripts-dd41384829d3448d9b71cd1c2d8048a9201e5003.tar.xz initscripts-dd41384829d3448d9b71cd1c2d8048a9201e5003.zip | |
Revert "don't do something odd if we find a mac address that matches the user-set MACADDR (#251415)"
Does not solve the issue, causes a regression in Fedora. (#450210)
This reverts commit 4912889cbc00cfe36945c7d57f8c15acf1f45333.
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 2f8257b2..a1a8eff3 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -158,7 +158,7 @@ is_available ${REALDEVICE} # bail out, if the MAC does not fit if [ -n "${HWADDR}" ]; then FOUNDMACADDR=`get_hwaddr ${REALDEVICE}` - if [ "${FOUNDMACADDR}" != "${HWADDR}" -a "${FOUNDMACADDR}" != "${MACADDR}" ]; then + if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then curdev=`ip -o link | awk -F ':' -vIGNORECASE=1 "/$HWADDR/ { print \\$2 }"` [ -n "$curdev" ] && rename_device "${REALDEVICE}" "${HWADDR}" "${curdev}" || { echo $"Device ${DEVICE} has different MAC address than expected, ignoring." |