revert to using *_ifnames internally, too many problems with firewall, ppp, etc....

[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 0cd6cb889fa8d469d7f6e0ab4af1239c99621c62..5bc74d12853ec8efb9439e54ae1a59bcc13e8241 100755 (executable)
--- a/package/base-files/default/lib/network/config.sh
+++ b/package/base-files/default/lib/network/config.sh
@@ -21,7 +21,7 @@ find_config() {
 }
 
 scan_interfaces() {
-       local mode iftype iface
+       local mode iftype iface ifname device
        interfaces=
        config_cb() {
                config_get iftype "$CONFIG_SECTION" TYPE
@@ -29,6 +29,14 @@ scan_interfaces() {
                        interface)
                                config_get proto "$CONFIG_SECTION" proto
                                append interfaces "$CONFIG_SECTION"
+                               config_get iftype "$CONFIG_SECTION" iftype
+                               case "$iftype" in
+                                       bridge)
+                                               config_get ifname "$CONFIG_SECTION" ifname
+                                               config_set "$CONFIG_SECTION" ifnames "$ifname"
+                                               config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
+                                       ;;
+                               esac
                                ( type "scan_$proto" ) >/dev/null 2>/dev/null && eval "scan_$proto '$CONFIG_SECTION'"
                        ;;
                esac