diff options
| author | Bill Nottingham <notting@redhat.com> | 2002-01-25 05:20:40 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2002-01-25 05:20:40 +0000 |
| commit | 543c9522feba2bff84f54c1d214d74f20ea0b5fd (patch) | |
| tree | f61866da7d44729fef1f3bbd9b1a7026bd044f63 | |
| parent | 28d15daa342f7cde4b17baa69340f6f568d6f54f (diff) | |
| download | initscripts-543c9522feba2bff84f54c1d214d74f20ea0b5fd.tar initscripts-543c9522feba2bff84f54c1d214d74f20ea0b5fd.tar.gz initscripts-543c9522feba2bff84f54c1d214d74f20ea0b5fd.tar.bz2 initscripts-543c9522feba2bff84f54c1d214d74f20ea0b5fd.tar.xz initscripts-543c9522feba2bff84f54c1d214d74f20ea0b5fd.zip | |
don't loop on bad HWADDR settings (#52285)
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 8b782ed4..51a07819 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -96,11 +96,11 @@ if [ -n "${HWADDR}" ]; then sed 's/.*link\/ether \([[:alnum:]:]*\).*/\1/'` if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then NEWCONFIG=`fgrep -l "HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*` - if [ -n "${NEWCONFIG}" ]; then + 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}" ]; then + if [ -n "${NEWCONFIG}" -a "`basename ${NEWCONFIG}`" != "${CONFIG}" ]; then exec /sbin/ifup ${NEWCONFIG} else echo $"Device ${DEVICE} has different MAC address than expected, ignoring." |