--- trunk/magellan-initscripts/etc/rc.d/init.d/network	2007/12/13 12:06:22	636
+++ trunk/magellan-initscripts/etc/rc.d/init.d/network	2008/03/22 17:54:46	691
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.14 2007-12-13 12:06:22 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.18 2008-03-22 17:54:46 niro Exp $
 
 #%rlevels: 0:k 1:k 2:k 3:s 4:s 5:s 6:k
 #%start: 20
@@ -24,7 +24,7 @@
 	# global
 	local ONBOOT
 	local NETWORKING
-	
+
 	# static
 	local IP
 	local NETMASK
@@ -277,9 +277,9 @@
 	fi
 
 	# check the config
-	if [[ -z ${BRIDGE_INTERFACE} ]]
+	if [[ -z ${BRIDGE_INTERFACES} ]]
 	then
-		echo "BRIDGE: no \$BRIDGE_INTERFACE given. Aborting setup."
+		echo "BRIDGE: no \$BRIDGE_INTERFACES given. Aborting setup."
 		return 1
 	fi
 
@@ -295,7 +295,7 @@
 				brctl addif ${iface} ${bport}
 			done
 			# enable spanning-tree protocol
-			case BRIDGE_STP in
+			case ${BRIDGE_STP} in
 				on|off) brctl stp ${iface} ${BRIDGE_STP} ;;
 				*) echo "BRIDGE: unkown value \$BRIDGE_STP='$BRIDGE_STP'."; return 1 ;;
 			esac
@@ -421,6 +421,8 @@
 			echo -e ${COLOREDSTAR}"Setting up default gateway for ${COLBLUE}${iface}${COLDEFAULT} ..."
 			route add default gateway ${GATEWAY} metric 1 dev ${iface}
 			evaluate_retval
+
+			unset GATEWAY
 		fi
 
 		# setup /etc/resolv.conf
@@ -434,6 +436,8 @@
 			do
 				echo "nameserver ${dns}" >> /etc/resolv.conf
 			done
+
+			unset NAMESERVER
 		fi
 	done