From 68f6710d4615fbd592b56dde555708f306310a1f Mon Sep 17 00:00:00 2001
From: Florian Maurer <f.maurer@outlook.de>
Date: Sat, 29 Jun 2024 01:58:41 +0200
Subject: [PATCH] private-wifi: rename ifname to wl-wanX  (#3294)

Rename this to avoid a potential collision with wired ethernet interfaces using the same name
---
 .../luasrc/lib/gluon/upgrade/325-gluon-private-wifi             | 2 +-
 .../luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/gluon-private-wifi/luasrc/lib/gluon/upgrade/325-gluon-private-wifi b/package/gluon-private-wifi/luasrc/lib/gluon/upgrade/325-gluon-private-wifi
index 2f46267b0..8facf45d9 100755
--- a/package/gluon-private-wifi/luasrc/lib/gluon/upgrade/325-gluon-private-wifi
+++ b/package/gluon-private-wifi/luasrc/lib/gluon/upgrade/325-gluon-private-wifi
@@ -12,7 +12,7 @@ wireless.foreach_radio(uci, function(radio)
 		return
 	end
 
-	uci:set('wireless', name, 'ifname', suffix and 'wan' .. suffix)
+	uci:set('wireless', name, 'ifname', suffix and 'wl-wan' .. suffix)
 end)
 
 uci:save('wireless')
diff --git a/package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua b/package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua
index c69d22c39..1be55abdf 100644
--- a/package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua
+++ b/package/gluon-web-private-wifi/luasrc/lib/gluon/config-mode/model/admin/privatewifi.lua
@@ -81,7 +81,7 @@ function f:write()
 				ssid       = ssid.data,
 				key        = key.data,
 				macaddr    = macaddr,
-				ifname     = suffix and 'wan' .. suffix,
+				ifname     = suffix and 'wl-wan' .. suffix,
 				disabled   = false,
 			})
 
-- 
GitLab