File sysconfig_rcnetwork_start_order.354471.patch of Package sysconfig

File sysconfig_rcnetwork_start_order.354471.patch of Package sysconfig (Revision 1)

Currently displaying revision 1, show latest

--- scripts/network
+++ scripts/network	2008/01/21 14:46:53
@@ -418,10 +418,18 @@
 # PHYSICAL_IFACES  are interfaces to present physical devices, they will be
 #                  derived from AVAILABLE_IFACES
 #
+# BONDING_IFACES   are bonding interfaces derived from ifcfg-* files
+#
+# VLAN_IFACES      are vlan (802.1q) 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
+# BRIDGE_IFACES    are bridge interfaces derived from ifcfg-* files
+#
+# TUNNEL_IFACES    are interfaces that do not fit into PHYSICAL, BONDING,
+#                  VLAN, DIALUP or BRIDGE, and are as well 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
@@ -442,9 +450,18 @@
 		eth*[0-9]|tr*[0-9]|wlan[0-9]|ath[0-9]|ip6tnl*[0-9]|mip6mnha*[0-9])
 			continue
 			;;
+		bond*[0-9])
+			BONDING_IFACES="$BONDING_IFACES $b"
+			;;
+		vlan*[0-9])
+			VLAN_IFACES="$VLAN_IFACES $b"
+			;;
 		*ppp*[0-9]|dsl*[0-9]|modem*[0-9])
 			DIALUP_IFACES="$DIALUP_IFACES $b"
 			;;
+		*br*[0-9])
+			BRIDGE_IFACES="$BRIDGE_IFACES $b"
+			;;
 		*[0-9])
 			TUNNEL_IFACES="$TUNNEL_IFACES $b"
 			;;
@@ -488,7 +505,7 @@
 			fi
 			;;
 	esac
-	for b in $DIALUP_IFACES $TUNNEL_IFACES; do
+	for b in $BONDING_IFACES $VLAN_IFACES $DIALUP_IFACES $TUNNEL_IFACES $BRIDGE_IFACES; do
 		if [ "$a" = "$b" ] ; then
 			NOT_PHYSICAL_IFACES="$NOT_PHYSICAL_IFACES $a"
 			continue 2
@@ -533,11 +550,11 @@
 				continue 2
 			fi
 		done
-		for d in $TUNNEL_IFACES; do
+		for d in $BONDING_IFACES $VLAN_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
@@ -550,7 +567,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=""
 
@@ -558,8 +575,11 @@
 debug "INTERFACE   = $INTERFACE"
 debug "AVAILABLE_IFACES = $AVAILABLE_IFACES"
 debug "PHYSICAL_IFACES  = $PHYSICAL_IFACES"
+debug "BONDING_IFACES   = $BONDING_IFACES"
+debug "VLAN_IFACES      = $VLAN_IFACES"
 debug "DIALUP_IFACES    = $DIALUP_IFACES"
 debug "TUNNEL_IFACES    = $TUNNEL_IFACES"
+debug "BRIDGE_IFACES    = $BRIDGE_IFACES"
 debug "MANDATORY_DEVICES = $MANDATORY_DEVICES"
 debug "SKIP             = $SKIP"
 
@@ -765,7 +785,7 @@
 
 
 		if [ -z "$INTERFACE" ] ; then
-			for IFACE in $DIALUP_IFACES $TUNNEL_IFACES ; do
+			for IFACE in $BONDING_IFACES $VLAN_IFACES $DIALUP_IFACES $TUNNEL_IFACES $BRIDGE_IFACES; do
 				$FAKE ifup $CONFIG $IFACE -o rc $MODE
 				RET=$?
 				debug && printf "    %-9s returned %s\n" $IFACE $RET
@@ -822,7 +842,8 @@
 			$FAKE ifdown-route noiface -o rc $MODE
 		fi
 
-		for IFACE in ${INTERFACE:-$AVAILABLE_IFACES} ; do
+		for IFACE in ${INTERFACE:-$BRIDGE_IFACES $TUNNEL_IFACES $DIALUP_IFACES $VLAN_IFACES $BONDING_IFACES $PHYSICAL_IFACES $AVAILABLE_IFACES} ; do
+			test -d /sys/class/net/$IFACE || continue
 			# printf "    %-9s " $IFACE
 			$FAKE ifdown $CONFIG $IFACE -o rc $MODE
 			RET=$?
@@ -901,7 +922,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 $VLAN_IFACES $DIALUP_IFACES $TUNNEL_IFACES $BRIDGE_IFACES; do
  	 			for MI in $MANDATORY_IFACES $TOCHECK_IFACES; do
  	 				test "$IFACE" = "$MI" && continue 2
  	 			done