base-files: allow wireless ifaces to be part of multiple networks

SVN-Revision: 32503
This commit is contained in:
Jo-Philipp Wich 2012-06-26 15:25:33 +00:00
parent 21fce4eeae
commit f2dde4f5ba
2 changed files with 10 additions and 5 deletions

View file

@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/version.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=110 PKG_RELEASE:=111
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host PKG_BUILD_DEPENDS:=opkg/host

View file

@ -38,9 +38,12 @@ bridge_interface() {(
include /lib/network include /lib/network
scan_interfaces scan_interfaces
config_get iftype "$cfg" type for cfg in $cfg; do
[ "$iftype" = bridge ] && config_get "$cfg" ifname config_get iftype "$cfg" type
prepare_interface_bridge "$cfg" [ "$iftype" = bridge ] && config_get "$cfg" ifname
prepare_interface_bridge "$cfg"
return $?
done
)} )}
prepare_key_wep() { prepare_key_wep() {
@ -132,7 +135,9 @@ start_net() {(
[ -z "$config" ] || { [ -z "$config" ] || {
include /lib/network include /lib/network
scan_interfaces scan_interfaces
setup_interface "$iface" "$config" "" "$vifmac" for config in $config; do
setup_interface "$iface" "$config" "" "$vifmac"
done
} }
)} )}