gluon-core: rename psk3 to sae as it is used in openwrt that way

add proper migration for older uci setting Signed-off-by: Florian Maurer <f.maurer@outlook.de>
ffac · Jan 7, 2025 · 8b0953a · 8b0953a
1 parent c31c7d7
commit 8b0953a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -13,6 +13,11 @@ wireless.foreach_radio(uci, function(radio)
 	end
 
 	uci:set('wireless', name, 'ifname', suffix and 'wl-wan' .. suffix)
+
+	-- migrate encryption from Gluon v2023.2.x or older
+	-- remove in 2027 or on first release supporting only upgrades from >=v2025.1.x
+	local encryption = uci:get('wireless', name, 'encryption')
+	uci:set('wireless', name, 'encryption', encryption:gsub("psk3", "sae"))
 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
@@ -49,8 +49,8 @@ local encryption = s:option(ListValue, "encryption", translate("Encryption"))
 encryption:depends(enabled, true)
 encryption:value("psk2", translate("WPA2"))
 if wireless.device_supports_wpa3() then
-	encryption:value("psk3-mixed", translate("WPA2 / WPA3"))
-	encryption:value("psk3", translate("WPA3"))
+	encryption:value("sae-mixed", translate("WPA2 / WPA3"))
+	encryption:value("sae", translate("WPA3"))
 end
 encryption.default = uci:get('wireless', primary_iface, 'encryption') or "psk2"