X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Fdefault%2Flib%2Fnetwork%2Fconfig.sh;h=bb58a3e751dd66f929eeb7515c9e5f88c5991027;hb=b9f75a560dedd426db89cb74b16aaad85b0f50be;hp=5bc74d12853ec8efb9439e54ae1a59bcc13e8241;hpb=00394c57717f28bb3b9860020729cd73036a8cf8;p=openwrt-10.03%2F.git

diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index 5bc74d128..bb58a3e75 100755
--- a/package/base-files/default/lib/network/config.sh
+++ b/package/base-files/default/lib/network/config.sh
@@ -4,12 +4,15 @@
 # DEBUG="echo"
 
 find_config() {
-	local iftype iface ifn
+	local iftype device iface ifaces ifn
 	for ifn in $interfaces; do
 		config_get iftype "$ifn" type
 		config_get iface "$ifn" ifname
+		case "$iftype" in
+			bridge) config_get ifaces "$ifn" ifnames;;
+		esac
 		config_get device "$ifn" device
-		for ifc in ${device:-$iface}; do
+		for ifc in $device $iface $ifaces; do
 			[ "$ifc" = "$1" ] && {
 				echo "$ifn"
 				return 0
@@ -29,7 +32,7 @@ scan_interfaces() {
 			interface)
 				config_get proto "$CONFIG_SECTION" proto
 				append interfaces "$CONFIG_SECTION"
-				config_get iftype "$CONFIG_SECTION" iftype
+				config_get iftype "$CONFIG_SECTION" type
 				case "$iftype" in
 					bridge)
 						config_get ifname "$CONFIG_SECTION" ifname