diff options
author | Bill Nottingham <notting@redhat.com> | 2004-03-17 02:42:34 +0000 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2004-03-17 02:42:34 +0000 |
commit | 9262352718c703c976eb4a94b0783dd18815a80c (patch) | |
tree | af2b08a0ef2dbfbf4b25de5307b5e1133b30fe91 /sysconfig | |
parent | 21031db783b5059b441a096fad1e4348b96fbca7 (diff) | |
download | initscripts-9262352718c703c976eb4a94b0783dd18815a80c.tar initscripts-9262352718c703c976eb4a94b0783dd18815a80c.tar.gz initscripts-9262352718c703c976eb4a94b0783dd18815a80c.tar.bz2 initscripts-9262352718c703c976eb4a94b0783dd18815a80c.tar.xz initscripts-9262352718c703c976eb4a94b0783dd18815a80c.zip |
fix some of the MACADDR/HWADDR conflicts (#110427)
Diffstat (limited to 'sysconfig')
-rwxr-xr-x | sysconfig/network-scripts/ifdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index ce8f2110..7aa852ca 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -49,7 +49,7 @@ fi # Check to make sure the device is actually up check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "bootp" ] && [ -n "$VLAN" -a "$VLAN" != "yes" ] && exit 0 -if [ -n "${HWADDR}" ]; then +if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then FOUNDMACADDR=`get_hwaddr ${REALDEVICE}` if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then NEWCONFIG=`fgrep -il "HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*` |