Merge pull request #3096 from herbetom/v2022.1.x-patches

[v2022.1.x]: backport network reconfiguration patches

package/gluon-core/luasrc/lib/gluon/upgrade/021-interface-roles

@@ -63,4 +63,23 @@ for iface in pairs(interfaces) do
 	end
 end
 
+-- Fix invalid role configurations
+
+uci:foreach('gluon', 'interface', function(interface)
+
+	local function has_role(role)
+		if interface.role == nil then
+			return false
+		end
+
+		return util.contains(interface.role, role)
+	end
+
+	if has_role('client') and (has_role('mesh') or has_role('uplink')) then
+		-- remove 'client' role
+		util.remove_from_set(interface.role, 'client')
+		uci:set('gluon', interface['.name'], 'role', interface.role)
+	end
+end)
+
 uci:save('gluon')