From bab72274889c5a086b51048be54eb821aed8acb9 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Sun, 5 Apr 2015 15:43:15 +0200
Subject: ifup-aliases: don't return with error when arping fails

  Resolves: RHBZ #1275550
---
 sysconfig/network-scripts/ifup-aliases | 15 +++++++++------
 1 file 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}
 
-- 
cgit v1.2.1