diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-11-30 12:32:12 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-11-30 12:32:12 +0000 |
| commit | 309956dc9e494a5294ed55c1941e94d355b1dbff (patch) | |
| tree | a751080327f52052bac5b447b559085256ecac9f /package/base-files | |
| parent | 140062d2d590e3c68275fdb004fd353b712cd248 (diff) | |
| download | master-187ad058-309956dc9e494a5294ed55c1941e94d355b1dbff.tar.gz master-187ad058-309956dc9e494a5294ed55c1941e94d355b1dbff.tar.bz2 master-187ad058-309956dc9e494a5294ed55c1941e94d355b1dbff.zip | |
base-files: uci-defaults-new, config_generate: allow force tagged cpu ports
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47679 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rwxr-xr-x | package/base-files/files/bin/config_generate | 8 | ||||
| -rwxr-xr-x | package/base-files/files/lib/functions/uci-defaults-new.sh | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index 6da386faff..45dcd71616 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -173,7 +173,8 @@ calculate_switch_vlans() { if [ "$role" != "$prev_role" ]; then if [ -n "$vlan_ports" ]; then let cpu_port="cpu$((vlan_off % n_cpu))" - [ $n_vlan -gt $n_cpu ] && cpu_port="${cpu_port}t" + let need_tag="tag$((vlan_off % n_cpu))" + [ $n_vlan -gt $n_cpu -o $need_tag -eq 1 ] && cpu_port="${cpu_port}t" uci -q batch <<-EOF add network switch_vlan @@ -198,8 +199,9 @@ calculate_switch_vlans() { # autogenerate interfaces vlan_off=0; while [ $vlan_off -lt $n_vlan ]; do eval role="\$role$((vlan_off))" - eval device="\$dev$((vlan_off++ % n_cpu))" - [ $n_vlan -gt $n_cpu ] && device="$device.$vlan_off" + eval device="\$dev$((vlan_off % n_cpu))" + let need_tag="tag$((vlan_off++ % n_cpu))" + [ $n_vlan -gt $n_cpu -o $need_tag -eq 1 ] && device="$device.$vlan_off" # quirk: append ifnames for subsequent switches case "$switch" in switch[1-9]) diff --git a/package/base-files/files/lib/functions/uci-defaults-new.sh b/package/base-files/files/lib/functions/uci-defaults-new.sh index 613a418a1d..ae23d22a79 100755 --- a/package/base-files/files/lib/functions/uci-defaults-new.sh +++ b/package/base-files/files/lib/functions/uci-defaults-new.sh @@ -116,7 +116,7 @@ ucidef_add_switch_attr() { ucidef_add_switch_ports() { local name="$1"; shift - local port num role dev idx + local port num role dev idx tag json_select_object switch json_select_object "$name" @@ -127,6 +127,11 @@ ucidef_add_switch_ports() { [0-9]*@*) num="${port%%@*}" dev="${port##*@}" + tag=0 + [ "${num%t}" != "$num" ] && { + num="${num%t}" + tag=1 + } ;; [0-9]*:*:[0-9]*) num="${port%%:*}" @@ -143,12 +148,13 @@ ucidef_add_switch_ports() { json_add_object json_add_int num "$num" [ -n "$dev" ] && json_add_string device "$dev" + [ -n "$tag" ] && json_add_boolean need_tag "$tag" [ -n "$role" ] && json_add_string role "$role" [ -n "$idx" ] && json_add_int index "$idx" json_close_object fi - unset num dev role idx + unset num dev role idx tag done json_select .. |