diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-02-28 16:40:06 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-02-28 16:40:06 +0000 |
| commit | b48013b35bcda1979506c8761c56282f1ec741e1 (patch) | |
| tree | 1f9fe1f979f94982a382d7d4bb548583243fe0fe /package/switch/files | |
| parent | 518b748f5f32f38f884fdacab607662d9eef67a3 (diff) | |
[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
Diffstat (limited to 'package/switch/files')
| -rw-r--r-- | package/switch/files/switch.sh | 10 |
1 files changed, 9 insertions, 1 deletions
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 |