From f753680e7675607d049edc5cda23acbd3a702944 Mon Sep 17 00:00:00 2001
From: lemoer <git@irrelefant.net>
Date: Sun, 7 Aug 2022 11:54:47 +0200
Subject: [PATCH] gluon-core: fix missing ifname for mesh_radio networks in uci

Before this comit, the networks in /etc/config/network looked like this:

	config interface 'mesh_radio0'
        	option proto 'gluon_mesh'

After this patch, the networks look like this:

	config interface 'mesh_radio0'
	        option proto 'gluon_mesh'
        	option ifname 'mesh0'

Especially, this fixes a regression bug, that the "wifi" section in the
respondd request type "neighbours" was empty:

	~# gluon-neighbour-info -d ::1 -r neighbours | ffh_pretty_json
	{
	  "wifi": [
	  ],
	  ...
	}

After this commit, the section (correctly) looks like this:

	root@UFU-FWH-A272-Tresckowstr-GemR-vorne:~# gluon-neighbour-info -d ::1 -r neighbours | ffh_pretty_json
	{
	  "wifi": {
	    "ca:38:7e:42:5f:21": {
	      "neighbours": {
	        "fe:9f:4d:01:ea:e1": {
	          "noise": -102,
	          "inactive": 50,
	          "signal": -84
	        },
	        "fe:df:b9:84:37:51": {
	          "noise": -102,
	          "inactive": 20,
	          "signal": -73
	        }
	      }
	    }
	  },
	  ...
	}
---
 package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless b/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
index 604e33a8..b28c4cf3 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
@@ -129,6 +129,7 @@ local function configure_mesh(config, radio, index, suffix, disabled)
 
 	uci:section('network', 'interface', name, {
 		proto = 'gluon_mesh',
+		ifname = suffix and 'mesh' .. suffix,
 	})
 
 	uci:section('wireless', 'wifi-iface', name, {