From 984e334adbd8abce84c0b4f48613bbb3f70179b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Fri, 3 Sep 2021 00:34:04 +0200 Subject: [PATCH] layer3-config: Add dsa migration script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to the switch from swconfig to DSA, the switchport names have to be migrated for some devices. Add a script to translate the switchport names to their DSA equivalents, where applicable. Fixes: #156 Signed-off-by: Fabian Bläse Reviewed-by: Robert Langhammer Reviewed-by: Christian Dresel Tested-by: Fabian Bläse --- src/packages/fff/fff-layer3-config/Makefile | 2 +- .../etc/uci-defaults/20-l3config-migrate-dsa | 79 +++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 src/packages/fff/fff-layer3-config/files/etc/uci-defaults/20-l3config-migrate-dsa diff --git a/src/packages/fff/fff-layer3-config/Makefile b/src/packages/fff/fff-layer3-config/Makefile index b4b776ff..3b9761f7 100644 --- a/src/packages/fff/fff-layer3-config/Makefile +++ b/src/packages/fff/fff-layer3-config/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-layer3-config -PKG_RELEASE:=8 +PKG_RELEASE:=9 include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-layer3-config/files/etc/uci-defaults/20-l3config-migrate-dsa b/src/packages/fff/fff-layer3-config/files/etc/uci-defaults/20-l3config-migrate-dsa new file mode 100644 index 00000000..5938eacc --- /dev/null +++ b/src/packages/fff/fff-layer3-config/files/etc/uci-defaults/20-l3config-migrate-dsa @@ -0,0 +1,79 @@ +## this script migrates configs from version 1 to 2. +## +## with version 2 the switchport names of some devices changed +## due to the switch to DSA + + +BOARD="$(uci get board.model.name)" + +# only migrate appropriate config versions +[ "$(uci -q get gateway.meta.config_version)" = "1" ] || exit 1 + +translate_ports() { + local vlan="$1" + local oldports="$(uci -q get gateway.$vlan.ports)" + local newports + + local name + local tag + + for port in $oldports; do + # generate new tagged/untagged syntax + if [ -z "${port##*t}" ]; then + # port is tagged + tag=":t" + else + # port is untagged + tag=":*" + fi + + # generate new name + case "$BOARD" in + ubnt,edgerouter-x|\ + ubnt,edgerouter-x-sfp) + case "${port%%t}" in + 0) name="eth0" ;; + 1) name="eth1" ;; + 2) name="eth2" ;; + 3) name="eth3" ;; + 4) name="eth4" ;; + 5) name="eth5" ;; + *) name="" ;; + esac + ;; + netgear,r6220) + case "${port%%t}" in + 0) name="lan1" ;; + 1) name="lan2" ;; + 2) name="lan3" ;; + 3) name="lan4" ;; + 4) name="wan" ;; + *) name="" ;; + esac + ;; + esac + + # catch empty name (invalid entry or old cpuport) + [ -z "$name" ] && continue + + # assemble new port name + newports="$newports ${name}${tag}" + done + + # cleanup unnecessary spaces + newports=$(echo "$newports" | xargs) + + uci set gateway.$vlan.ports="$newports" +} + +case "$BOARD" in + ubnt,edgerouter-x|\ + ubnt,edgerouter-x-sfp|\ + netgear,r6220) + config_load gateway + config_foreach translate_ports vlan + ;; +esac + +uci set gateway.meta.config_version='2' +uci commit gateway