Attachment 308341 Details for Bug 449950 – patch for /etc/sysconfif/network-scripts/ifup-eth

[patch] patch for /etc/sysconfif/network-scripts/ifup-eth

bond_before_bridge.patch (text/plain), 2.03 KB, created by David Juran on 2008-06-04 13:31:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Juran

Created: 2008-06-04 13:31:39 UTC

Size: 2.03 KB

patch

obsolete

>--- ifup-eth.bak	2008-06-04 15:14:41.000000000 +0300
>+++ ifup-eth	2008-06-04 15:55:56.000000000 +0300
>@@ -88,23 +88,6 @@
> # is the device wireless? If so, configure wireless device specifics
> is_wireless_device ${DEVICE} && . ./ifup-wireless
> 
>-if [ -n "${BRIDGE}" -a -x /usr/sbin/brctl ]; then
>-      if ! LC_ALL=C /usr/sbin/brctl show | LC_ALL=C grep -q "^${BRIDGE}	"; then
>-	  /usr/sbin/brctl addbr ${BRIDGE} 2>/dev/null
>-      fi
>-      /sbin/ip addr flush dev ${DEVICE} 2>/dev/null
>-      /sbin/ip link set dev ${DEVICE} up
>-      if [ -n "$ETHTOOL_OPTS" ] ; then
>-        /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS
>-      fi
>-      [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
>-      /usr/sbin/brctl addif ${BRIDGE} ${DEVICE}
>-      # Upon adding a device to a bridge, 
>-      # it's necessary to make radvd reload its config
>-      [ -r /var/run/radvd/radvd.pid ] && kill -HUP `cat /var/run/radvd/radvd.pid`
>-      exit 0
>-fi 
>-
> # this isn't the same as the MAC in the configuration filename.  It is
> # available as a configuration option in the config file, forcing the kernel
> # to think an ethernet card has a different MAC address than it really has.
>@@ -167,6 +150,25 @@
>     done
> fi
> 
>+if [ -n "${BRIDGE}" -a -x /usr/sbin/brctl ]; then
>+      set -x
>+      if ! LC_ALL=C /usr/sbin/brctl show | LC_ALL=C grep -q "^${BRIDGE}	"; then
>+	  /usr/sbin/brctl addbr ${BRIDGE} 2>/dev/null
>+      fi
>+      /sbin/ip addr flush dev ${DEVICE} 2>/dev/null
>+      /sbin/ip link set dev ${DEVICE} up
>+      if [ -n "$ETHTOOL_OPTS" ] ; then
>+        /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS
>+      fi
>+      [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
>+      /usr/sbin/brctl addif ${BRIDGE} ${DEVICE}
>+      # Upon adding a device to a bridge, 
>+      # it's necessary to make radvd reload its config
>+      [ -r /var/run/radvd/radvd.pid ] && kill -HUP `cat /var/run/radvd/radvd.pid`
>+      set +x
>+      exit 0
>+fi 
>+
> 		     
> if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then
>     # Remove any temporary references which were previously added to dhclient config

Actions: View | Diff

Attachments on bug 449950: 308341