fix conflict

fedora-sysv · Nov 19, 2024 · a83f040 · a83f040
2 parents 76818bf + f4a6ef3
commit a83f040
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/network-scripts/ifup-eth b/network-scripts/ifup-eth
@@ -295,16 +295,13 @@ else
                 if [ "${REALDEVICE}" != "lo" ] && ! is_false "${arpcheck[$idx]}"; then
                     while [ "${tries}" -le "${ARPING_TRIES}" ]; do
                         ARPING=$(/sbin/arping -c 2 -w ${ARPING_WAIT:-3} -D -I ${REALDEVICE} ${ipaddr[$idx]})
-                        if [ $? = 1 ]; then
-                            ARPINGMAC=$(echo $ARPING |  sed -ne 's/.*\[\(.*\)\].*/\1/p')
-                            if [ -n "${ARPINGMAC}" ]; then
-                                net_log $"Error, some other host ($ARPINGMAC) already uses address ${ipaddr[$idx]}."
-                                break
-                            fi
-                            tries=$((tries+1))
-                        else
+                        [ $? = 0 ] && break
+                        ARPINGMAC=$(echo $ARPING |  sed -ne 's/.*\[\(.*\)\].*/\1/p')
+                        if [ -n "${ARPINGMAC}" ]; then
+                            net_log $"Error, some other host ($ARPINGMAC) already uses address ${ipaddr[$idx]}."
                             break
                         fi
+                        tries=$((tries+1))
                     done
                     if [ "${tries}" -gt "${ARPING_TRIES}" ]; then
                         net_log $"arping failed after $tries tries"