aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-10-16 01:31:03 +0200
committerJo-Philipp Wich <jo@mein.io>2017-02-02 00:13:49 +0100
commit73d923ed6baabe3f8844f13216c50a6383a79a46 (patch)
tree20227930c67d3eb05b60a991c22ea291b8a0e429
parent770ac77cce59c4544dae65aeb1a3908623883854 (diff)
downloadupstream-73d923ed6baabe3f8844f13216c50a6383a79a46.tar.gz
upstream-73d923ed6baabe3f8844f13216c50a6383a79a46.tar.bz2
upstream-73d923ed6baabe3f8844f13216c50a6383a79a46.zip
base-files: emit tagged switch configuration by default
Instead of only using tagged CPU port configurations when more than one VLAN is present on the switch, always emit tagged configurations unless a board explicitely opts out of this behaviour by using the previously introduced [0-9]u@netdev syntax. Emitting default tagged configurations has the following benefits: - Relation of switch vlans to netdevs is easier to understand, especially for multi-cpu-port switches - Adding additional VLANs (e.g. to break out a LAN port for other purposes) becomes easier as users are not forced to change the existing untagged VLAN to tagged and the existing ifname notation from ethX to ethX.Y anymore, drastly reducing the likelyhood of soft-bricks. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rwxr-xr-xpackage/base-files/files/lib/functions/uci-defaults.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index 3500d49baa..f4c1d968e2 100755
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -160,7 +160,7 @@ _ucidef_finish_switch_roles() {
json_select ..
json_select ..
- if [ $n_vlan -gt $n_cpu -o ${need_tag:-0} -eq 1 ]; then
+ if [ ${need_tag:-0} -eq 1 -o ${want_untag:-0} -ne 1 ]; then
num="${num}t"
device="${device}.${index}"
fi