From 866a8f11401ede1483b9da1ebec0b511599c533b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 28 Feb 2010 16:40:06 +0000 Subject: [package] switch: eliminate the asterisk from the switch port configuration and set it automatically on the first vlan, this aligns the broadcom vlan config with the swconfig format git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19909 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/switch/files/switch.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'package/switch/files') diff --git a/package/switch/files/switch.sh b/package/switch/files/switch.sh index 14bacadc5d..708ca85e8f 100644 --- a/package/switch/files/switch.sh +++ b/package/switch/files/switch.sh @@ -25,13 +25,21 @@ setup_switch_vlan() { config_get vlan "$s" vlan config_get ports "$s" ports - [ -n "$dev" ] && [ -n "$vlan" ] && { + [ -n "$dev" ] && [ -n "$vlan" ] && { + ports="${ports%\*}" + + [ "$_vlan_pvid_set" = 1 ] || { + ports="$ports*" + _vlan_pvid_set=1 + } + local proc="/proc/switch/$dev/vlan/$vlan/ports" [ -f "$proc" ] && echo "$ports" > "$proc" } } setup_switch() { + _vlan_pvid_set=0 config_load network config_foreach setup_switch_hw switch config_foreach setup_switch_vlan switch_vlan -- cgit v1.2.3