ifup/ifdown-eth: properly add and remove arp_ip_target's

    Only add arp_ip_target, if not yet present.

    Only remove arp_ip_target, if present in BONDING_OPTS, to prevent clash
    with module options.

    https://bugzilla.redhat.com/show_bug.cgi?id=604669

2 files changed, 27 insertions, 4 deletions

diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index d9a5b43a..ca570cd4 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -57,8 +57,25 @@ if is_bonding_device ${DEVICE} ; then
 	is_ignored_file "$device" && continue
 	/sbin/ifdown ${device##*/}
     done
-    for target in $(cat /sys/class/net/${DEVICE}/bonding/arp_ip_target) ; do
-	echo "-${target}" > /sys/class/net/${DEVICE}/bonding/arp_ip_target
+    for arg in $BONDING_OPTS ; do
+	key=${arg%%=*};
+	[[ "${key}" != "arp_ip_target" ]] || continue
+	value=${arg##*=};
+	if [ "${value:0:1}" != "" ]; then
+            OLDIFS=$IFS;
+            IFS=',';
+            for arp_ip in $value; do
+		if grep -q $arp_ip /sys/class/net/${DEVICE}/bonding/arp_ip_target; then
+                    echo "-$arp_ip" > /sys/class/net/${DEVICE}/bonding/arp_ip_target
+		fi
+            done
+            IFS=$OLDIFS;
+	else
+	    value=${value#};
+	    if grep -q $value /sys/class/net/${DEVICE}/bonding/arp_ip_target; then
+                echo "-$value" > /sys/class/net/${DEVICE}/bonding/arp_ip_target
+	    fi
+	fi
     done
 fi
 
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 63ee1030..3658bd36 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -125,10 +125,16 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
             OLDIFS=$IFS;
             IFS=',';
             for arp_ip in $value; do
-                echo +$arp_ip > /sys/class/net/${DEVICE}/bonding/$key
+		if ! grep -q $arp_ip /sys/class/net/${DEVICE}/bonding/$key; then
+                    echo +$arp_ip > /sys/class/net/${DEVICE}/bonding/$key
+		fi
             done
             IFS=$OLDIFS;
-        else
+        elif [ "${key}" = "arp_ip_target" ]; then
+	    if ! grep -q ${value#+} /sys/class/net/${DEVICE}/bonding/$key; then
+                echo "$value" > /sys/class/net/${DEVICE}/bonding/$key
+	    fi
+	else
             echo $value > /sys/class/net/${DEVICE}/bonding/$key
         fi
     done