From: Rafał Miłecki <rafal@milecki.pl>
Date: Thu, 20 May 2021 10:23:55 +0000 (+0200)
Subject: Revert "base-files: migrate old UCI network bridge ports syntax"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=80be798d4a4f;p=openwrt%2Fstaging%2Fthess.git

Revert "base-files: migrate old UCI network bridge ports syntax"

This reverts commit f716c30241d5fd9d821560f58d0af0c3ffe78600.

Migrating everyone to the new syntax could break downgrades. We may
reintroduce it way later if needed.

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
deleted file mode 100644
index 745648531f..0000000000
--- a/package/base-files/files/etc/uci-defaults/11_network-migrate-bridges
+++ /dev/null
@@ -1,23 +0,0 @@
-. /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