Attachment 491474 Details for Bug 604669 – proposed patch

[patch] proposed patch

initscripts-bonding.patch (text/plain), 2.65 KB, created by Harald Hoyer on 2011-04-12 12:38:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Hoyer

Created: 2011-04-12 12:38:57 UTC

Size: 2.65 KB

patch

obsolete

>commit c3f28b98b89b17de5f3eef05eb013435c6e66d4f
>Author: Harald Hoyer <harald@redhat.com>
>Date:   Tue Apr 12 14:28:39 2011 +0200
>
>    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
>
>diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
>index 31ba0ca..2be3ef4 100755
>--- a/sysconfig/network-scripts/ifdown-eth
>+++ b/sysconfig/network-scripts/ifdown-eth
>@@ -45,11 +45,30 @@ 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
> 
>+
> if [ "${NETWORKING_IPV6}" = "yes" ]; then
>     /etc/sysconfig/network-scripts/ifdown-ipv6 ${CONFIG}
>     if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -f /var/run/dhcp6c_${DEVICE}.pid ]; then
>diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
>index 85dad42..fa0f91b 100755
>--- a/sysconfig/network-scripts/ifup-eth
>+++ b/sysconfig/network-scripts/ifup-eth
>@@ -119,10 +119,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

Actions: View | Diff

Attachments on bug 604669: 424439 | 491474