fix minor typo & move loopback to network config

[openwrt-10.03/.git] / package / base-files / default / lib / network / config.sh

diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index 5bc74d12853ec8efb9439e54ae1a59bcc13e8241..bb58a3e751dd66f929eeb7515c9e5f88c5991027 100755 (executable)
--- 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