From: Rafał Miłecki <rafal@milecki.pl>
Date: Sat, 15 May 2021 21:04:35 +0000 (+0200)
Subject: base-files: migrate old UCI network bridge ports syntax
X-Git-Tag: v22.03.0-rc1~2553
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f716c30241d5fd9d821560f58d0af0c3ffe78600;p=openwrt%2Fopenwrt.git

base-files: migrate old UCI network bridge ports syntax

netifd has been recently patched to use more accurate "ports" option
instead of "ifname". This is a simple translation between two UCI
options.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/package/base-files/files/etc/uci-defaults/11_network-migrate-bridges b/package/base-files/files/etc/uci-defaults/11_network-migrate-bridges
new file mode 100644
index 0000000000..745648531f
--- /dev/null
+++ b/package/base-files/files/etc/uci-defaults/11_network-migrate-bridges
@@ -0,0 +1,23 @@
+. /lib/functions.sh
+
+migrate_ports() {
+	local config="$1"
+	local type ports ifname
+
+	config_get type "$config" type
+	[ "$type" != "bridge" ] && return
+
+	config_get ports "$config" ports
+	[ -n "$ports" ] && return
+
+	config_get ifname "$config" ifname
+	[ -z "$ifname" ] && return
+
+	for port in $ifname; do uci add_list network.$config.ports="$port"; done
+	uci delete network.$config.ifname
+}
+
+config_load network
+config_foreach migrate_ports device
+
+exit 1