--- network.orig	2008-05-28 22:35:05.000000000 +1000
+++ network	2008-05-29 00:02:41.000000000 +1000
@@ -105,7 +105,19 @@
 	for ifline in ${BOND_INTERFACES[@]}; do
 		if [ "$ifline" = "${ifline#!}" ]; then
 			eval bondcfg="\$bond_${ifline}"
-			/sbin/ifenslave $ifline $bondcfg || error=1
+			if [ -n "${bondcfg}" ]; then
+				/sbin/ifenslave $ifline $bondcfg || error=1
+			fi
+		fi
+	done
+}
+
+bond_down()
+{
+	for ifline in ${BOND_INTERFACES[@]}; do
+		if [ "$ifline" = "${ifline#!}" ]; then
+			eval bondcfg="\$bond_${ifline}"
+			/sbin/ifenslave -d $ifline $bondcfg || error=1
 		fi
 	done
 }
@@ -123,6 +135,15 @@
 			eval brifs="\$bridge_${br}"
 			for brif in $brifs; do
 				if [ "$brif" = "${brif#!}" ]; then
+					for ifline in ${BOND_INTERFACES[@]}; do
+						if [ "$brif" = "$ifline" ] && [ "$ifline" = "${ifline#!}" ]; then
+							ifup $ifline
+							eval bondcfg="\$bond_${ifline}"
+							/sbin/ifenslave $ifline $bondcfg || error=1
+							unset bond_${ifline}
+						fi
+					done
+
 					/usr/sbin/brctl addif $br $brif || error=1
 				fi
 			done
@@ -186,6 +207,8 @@
 				rtdown $rtline || error=1
 			fi
 		done
+		# bring down bond interfaces
+		bond_down
 		for ifline in ${INTERFACES[@]}; do
 			if [ "$ifline" = "${ifline#!}" ]; then
 				ifdown $ifline || error=1