summaryrefslogtreecommitdiff
path: root/openwrt/package/base-files/default/lib
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-08-24 13:46:47 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-08-24 13:46:47 +0000
commit9f816bf69d4d1c4f43c299c06563af60caa383a7 (patch)
treefe3de16f7bea0719cb4f56e53a091046524ce0ba /openwrt/package/base-files/default/lib
parente23ea22b7a5323c119468cfffc40aa71cbf7e48d (diff)
downloadmtk-20170518-9f816bf69d4d1c4f43c299c06563af60caa383a7.zip
mtk-20170518-9f816bf69d4d1c4f43c299c06563af60caa383a7.tar.gz
mtk-20170518-9f816bf69d4d1c4f43c299c06563af60caa383a7.tar.bz2
revert to using *_ifnames internally, too many problems with firewall, ppp, etc. otherwise
SVN-Revision: 4653
Diffstat (limited to 'openwrt/package/base-files/default/lib')
-rwxr-xr-xopenwrt/package/base-files/default/lib/network/config.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/openwrt/package/base-files/default/lib/network/config.sh b/openwrt/package/base-files/default/lib/network/config.sh
index d4864ae..5bc74d1 100755
--- a/openwrt/package/base-files/default/lib/network/config.sh
+++ b/openwrt/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,10 +29,15 @@ 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'"
- config_get ifname "$CONFIG_SECTION" ifname
- config_get device "$CONFIG_SECTION" device
- config_set "$CONFIG_SECTION" device "${device:-$ifname}"
;;
esac
}