diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2015-04-05 15:43:15 +0200 |
|---|---|---|
| committer | Dee'Kej <deekej@linuxmail.org> | 2016-11-01 13:01:41 +0100 |
| commit | bab72274889c5a086b51048be54eb821aed8acb9 (patch) | |
| tree | d85fc8601c9c534f628d9c722045d7cc81117c27 | |
| parent | 1cd4606a6de43fb9914f7099db2e30e3e2932dc0 (diff) | |
| download | initscripts-bab72274889c5a086b51048be54eb821aed8acb9.tar initscripts-bab72274889c5a086b51048be54eb821aed8acb9.tar.gz initscripts-bab72274889c5a086b51048be54eb821aed8acb9.tar.bz2 initscripts-bab72274889c5a086b51048be54eb821aed8acb9.tar.xz initscripts-bab72274889c5a086b51048be54eb821aed8acb9.zip | |
ifup-aliases: don't return with error when arping fails
Resolves: RHBZ #1275550
| -rwxr-xr-x | sysconfig/network-scripts/ifup-aliases | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases index d1b0742e..d0d72c0b 100755 --- a/sysconfig/network-scripts/ifup-aliases +++ b/sysconfig/network-scripts/ifup-aliases @@ -268,12 +268,15 @@ function new_interface () is_available ${parent_device} && \ ( grep -qswi "up" /sys/class/net/${parent_device}/operstate || grep -qswi "1" /sys/class/net/${parent_device}/carrier ) ; then echo $"Determining if ip address ${IPADDR} is already in use for device ${parent_device}..." - if ! ARPING=$(/sbin/arping -c 2 -w ${ARPING_WAIT:-3} -D -I ${parent_device} ${IPADDR}) ; then - ARPINGMAC=$(echo $ARPING | sed -ne 's/.*\[\(.*\)\].*/\1/p') - net_log $"Error, some other host ($ARPINGMAC) already uses address ${IPADDR}." - return 1 - fi - fi + + ARPING="/sbin/arping -q -c 2 -w ${ARPING_WAIT:-3} -D -I ${parent_device} ${IPADDR}" + + if [ $? = 1 ]; then + ARPINGMAC=$(echo $ARPING | sed -ne 's/.*\[\(.*\)\].*/\1/p') + net_log $"Error, some other host ($ARPINGMAC) already uses address ${IPADDR}." + return 1 + fi + fi /sbin/ip addr add ${IPADDR}/${PREFIX} brd ${BROADCAST} dev ${parent_device} label ${DEVICE} |