Attachment 188051 Details for Bug 343844

[patch] proposed patch

rcnetwork-bridge-bonding.dif (text/plain), 3.27 KB, created by Marius Tomaschewski on 2007-12-18 13:51:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2007-12-18 13:51:43 UTC

Size: 3.27 KB

patch

obsolete

>--- /etc/init.d/network	2007/12/18 13:44:29	1.1
>+++ /etc/init.d/network	2007/12/18 13:45:00
>@@ -430,10 +430,14 @@
> # PHYSICAL_IFACES  are interfaces to present physical devices, they will be
> #                  derived from AVAILABLE_IFACES
> #
>+# BONDING_IFACES   are bonding interfaces derived from ifcfg-* files
>+#
> # DIALUP_IFACES    are modemX, dslX, etc., they are derived from ifcfg-* files
> #
>-# TUNNEL_IFACES    are interfaces that do not fit into PHYSICAL and DIALUP and
>-#                  are as well derived from ifcfg-* files
>+# TUNNEL_IFACES    are interfaces that do not fit into PHYSICAL, DIALUP, BRIDGE
>+#                  or BONDING and are as well derived from ifcfg-* files
>+#
>+# BRIDGE_IFACES    are bridge interfaces derived from ifcfg-* files
> #
> #    PHYSICAL, DIALUP and TUNNEL are mutually exclusive. Their union contains
> #    AVAILABLE and MANDATORY and all of them have to be set up when starting
>@@ -448,12 +452,18 @@
> 		lo|eth|tr|wlan|irda|ip6tnl|mip6mnha)
> 			continue
> 			;;
>+		bond)
>+			BONDING_IFACES="$BONDING_IFACES $b"
>+			;;
> 		*ppp|dsl|modem|isdn)
> 			DIALUP_IFACES="$DIALUP_IFACES $b"
> 			;;
>-		vlan|bond|bridge|ipip|sit|gre)
>+		vlan|ipip|sit|gre)
> 			TUNNEL_IFACES="$TUNNEL_IFACES $b"
> 			;;
>+		bridge)
>+			BRIDGE_IFACES="$BRIDGE_IFACES $b"
>+			;;
> 		*)
> 			err_mesg "$b has unknown interface type. Please file a bug report."
> 			;;
>@@ -482,7 +492,7 @@
> 			continue
> 			;;
> 	esac
>-	for b in $DIALUP_IFACES $TUNNEL_IFACES; do
>+	for b in $BONDING_IFACES $DIALUP_IFACES $TUNNEL_IFACES $BRIDGE_IFACES; do
> 		if [ "$a" = "$b" ] ; then
> 			NOT_PHYSICAL_IFACES="$NOT_PHYSICAL_IFACES $a"
> 			continue 2
>@@ -523,11 +533,11 @@
> 				continue 2
> 			fi
> 		done
>-		for d in $TUNNEL_IFACES; do
>+		for d in $BONDING_IFACES $TUNNEL_IFACES $BRIDGE_IFACES; do
> 			if [ "$b" = "$d" ] ; then
> 				b="`get_slaves $b`"
> 				test $? = 0 || continue 2
>-				TUNNEL_SLAVES="$TUNNEL_SLAVES $b"
>+				SLAVE_IFACES="$SLAVE_IFACES $b"
> 				continue 2
> 			fi
> 		done
>@@ -540,7 +550,7 @@
> 		     "/etc/sysconfig/network/config"
> 	fi
> fi
>-MANDATORY_DEVICES="$MANDATORY_DEVICES __NSC__ $TUNNEL_SLAVES"
>+MANDATORY_DEVICES="$MANDATORY_DEVICES __NSC__ $SLAVE_IFACES"
> # Check for mandatory devices only when booting
> test "$MODE" = onboot || MANDATORY_DEVICES=""
> 
>@@ -548,8 +558,10 @@
> debug "INTERFACE   = $INTERFACE"
> debug "AVAILABLE_IFACES = $AVAILABLE_IFACES"
> debug "PHYSICAL_IFACES  = $PHYSICAL_IFACES"
>+debug "BONDING_IFACES   = $BONDING_IFACES"
> debug "DIALUP_IFACES    = $DIALUP_IFACES"
> debug "TUNNEL_IFACES    = $TUNNEL_IFACES"
>+debug "BRIDGE_IFACES    = $BRIDGE_IFACES"
> debug "MANDATORY_DEVICES = $MANDATORY_DEVICES"
> debug "SKIP             = $SKIP"
> 
>@@ -743,7 +755,7 @@
> 
> 
> 		if [ -z "$INTERFACE" ] ; then
>-			for IFACE in $DIALUP_IFACES $TUNNEL_IFACES ; do
>+			for IFACE in $BONDING_IFACES $DIALUP_IFACES $TUNNEL_IFACES $BRIDGE_IFACES ; do
> 				$FAKE ifup $CONFIG $IFACE -o rc $MODE
> 				RET=$?
> 				debug && printf "    %-9s returned %s\n" $IFACE $RET
>@@ -881,7 +893,7 @@
>  	 		done
> 			debug getting MANDATORY_IFACES: FAILED=$FAILED
>  	 
>- 	 		for IFACE in $AVAILABLE_IFACES $DIALUP_IFACES $TUNNEL_IFACES; do
>+ 	 		for IFACE in $AVAILABLE_IFACES $BONDING_IFACES $DIALUP_IFACES $TUNNEL_IFACES $BRIDGE_IFACES ; do
>  	 			for MI in $MANDATORY_IFACES $TOCHECK_IFACES; do
>  	 				test "$IFACE" = "$MI" && continue 2
>  	 			done

Actions: View | Diff

Attachments on bug 343844: 188051