From: Rafał Miłecki <rafal@milecki.pl>
Date: Tue, 18 May 2021 21:41:33 +0000 (+0200)
Subject: base-files: migrate old UCI network sections defining bridges
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=156f5e8f48adf12201849ad33d2b85e3d5a90ae7;p=openwrt%2Fstaging%2Fjow.git

base-files: migrate old UCI network sections defining bridges

Old "interface" sections for bridges were mixing layer 2 and layer 3.
That syntax got deprecated and UCI section "device" is used for bridge
configuration now.

Backward compatibility may be dropped from netifd soon now so migrate
old configs using uci-defaults script.

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
index ad13d1a353..a9dece418d 100644
--- a/package/base-files/files/etc/uci-defaults/11_network-migrate-bridges
+++ b/package/base-files/files/etc/uci-defaults/11_network-migrate-bridges
@@ -19,5 +19,31 @@ migrate_ports() {
 	uci delete network.$config.ifname
 }
 
+migrate_bridge() {
+	local config="$1"
+	local type ifname
+
+	config_get type "$config" type
+	[ "$type" != "bridge" ] && return
+
+	config_get ifname "$config" ifname
+
+	uci -q batch <<-EOF
+		add network device
+		set network.@device[-1].name='br-$config'
+		set network.@device[-1].type='bridge'
+	EOF
+	for port in $ifname; do
+		uci add_list network.@device[-1].ports="$port"
+	done
+
+	uci -q batch <<-EOF
+		delete network.$config.type
+		delete network.$config.ifname
+		set network.$config.device='br-$config'
+	EOF
+}
+
 config_load network
 config_foreach migrate_ports device
+config_foreach migrate_bridge interface