[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

SVN-Revision: 19909

diff --git a/package/switch/files/switch.sh b/package/switch/files/switch.sh
index 14bacadc5db13b0f748bc80892a7f15a004b1eb2..708ca85e8fb3bd35dbeac283690858e8c9584cc5 100644 (file)
--- 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
 
        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() {
                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
        config_load network
        config_foreach setup_switch_hw switch
        config_foreach setup_switch_vlan switch_vlan

diff --git a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
index 435288fa80480504c897370b7e17c025b08ab483..0e014b625c87d078407371c1009fd6347c1bb1c9 100755 (executable)
--- a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
+++ b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
@@ -14,11 +14,12 @@ start() {
                                        case "$1" in
                                        vlan[0-9]|vlan1[0-5])
                                                local id="${1#vlan}"
                                        case "$1" in
                                        vlan[0-9]|vlan1[0-5])
                                                local id="${1#vlan}"

+                                               local ports="${2%\*}"

                                                append batch "delete network.eth0.${1}${N}"
                                                append batch "set network.eth0_${id}=switch_vlan${N}"
                                                append batch "set network.eth0_${id}.device=eth0${N}"
                                                append batch "set network.eth0_${id}.vlan=${id}${N}"
                                                append batch "delete network.eth0.${1}${N}"
                                                append batch "set network.eth0_${id}=switch_vlan${N}"
                                                append batch "set network.eth0_${id}.device=eth0${N}"
                                                append batch "set network.eth0_${id}.vlan=${id}${N}"

-                                               append batch "set network.eth0_${id}.ports='${2}'${N}"
+                                               append batch "set network.eth0_${id}.ports='${ports}'${N}"

                                        ;;
                                        esac
                                }
                                        ;;
                                        esac
                                }