From 631b91d336d4adc6a4a85e162fa91cc6ea5a00c6 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Wed, 28 Nov 2012 16:55:48 +0100
Subject: Improve duplicate ip address check in ifup-aliases (#880684)

---
 sysconfig/network-scripts/ifup-aliases | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 6a428584..0cd9866f 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -139,6 +139,7 @@ function ini_env ()
        GATEWAY=$default_GATEWAY
        NO_ALIASROUTING=$default_NO_ALIASROUTING
        ONPARENT=""
+       ARPCHECK=""
 }
 
 function is_default_gateway ()
@@ -257,7 +258,9 @@ function new_interface ()
        fi
 
        if [ "$setup_this" = "yes" ] ; then
-               [ "${REALDEVICE}" != "lo" ] && \
+               [ "${parent_device}" != "lo" ] &&  [ "${ARPCHECK}" != "no" ] && \
+               is_available ${parent_device} && \
+               grep -qswi "up" /sys/class/net/${parent_device}/operstate && \
                if ! /sbin/arping -q -c 2 -w 3 -D -I ${parent_device} ${IPADDR} ; then
                    net_log $"Error, some other host already uses address ${IPADDR}."
                    return 1
-- 
cgit v1.2.1