[Devil-linux-commit] build/config/etc/init.d network,1.32.2.1,1.32.2.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10117/config/etc/init.d

Modified Files:
      Tag: rel-1-2-patches
	network 
Log Message:
- new parameter MODULE_OPTS for ifcfg- files
- added bonding network interface support (Heiko + Karsten Schwarz)
- vlan interface startup fixed (Heiko / Karsten Schwarz)


Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -d -r1.32.2.1 -r1.32.2.2
--- network	29 Jan 2005 20:49:08 -0000	1.32.2.1
+++ network	21 Aug 2005 22:13:42 -0000	1.32.2.2
@@ -146,6 +146,10 @@
 	MAC=
 	ROUTE=
 	BR_IF=
+	BONDING_MASTER=
+	BONDING_SLAVES=
+	BONDING_OPTS=
+	MODULE_OPTS=
 
 	# IPv6 stuff
 	IPV6ADDR=
@@ -171,9 +175,10 @@
 	#
 	if [ "$ONBOOT" = "yes" -o "$ONLY_INTERFACE" = "$IF" ]; then
 		if [ -n "$MODULE" ]; then
-			modprobe $MODULE > /dev/null
+			modprobe $MODULE $MODULE_OPTS > /dev/null
 		fi
 
+
 		if [ "$WIRELESS" = "yes" ]; then
 			setup_wireless $DEVICE
 		fi
@@ -230,6 +235,12 @@
 				done
 			fi
 
+			if [ "$BONDING_MASTER" = "yes" ]; then
+				for i in "$BONDING_SLAVES"; do	
+					ifenslave $DEVICE $i $BONDING_OPTS; let ret=$ret+$?
+				done
+			fi
+
 			# evaluate combined result
 			test $ret -eq 0
 			evaluate_retval
@@ -367,6 +378,20 @@
 			# bring up the interface
 			setup_interface $interface
 		done
+#
+#	Bonding Master
+#
+		for interface in $(cd ${CONFIG_DIR}; ls -1 ${CONFIG_FILE}* 2>/dev/null | sed \
+			-e '/.sample/d' -e '/~/d' -e "s|${CONFIG_FILE}||" -e '/^lo$/d' -e '/^vlan/d' -e '/^eth/d' -ne '/^bond/p')
+		do
+			# did user choose to only handle just one interface
+			# this time?
+			test -n "$ONLY_INTERFACE" -a "$ONLY_INTERFACE" != "$interface" \
+				&& continue
+
+			# bring up the interface
+			setup_interface $interface
+		done
 
 		#
 		# vlan interfaces
@@ -387,7 +412,7 @@
 		# bridge interfaces
 		#
 		for interface in $(cd ${CONFIG_DIR}; ls -1 ${CONFIG_FILE}* 2>/dev/null | sed \
-			-e '/.sample/d' -e '/~/d' -e "s|${CONFIG_FILE}||" -e '/^lo$/d' -e '/^vlan/p' -ne '/^br/p')
+			-e '/.sample/d' -e '/~/d' -e "s|${CONFIG_FILE}||" -e '/^lo$/d' -e '/^vlan/d' -ne '/^br/p')
 		do
 			# did user choose to only handle just one interface
 			# this time?