Skip to content

Commit

Permalink
core: remove old migrations
Browse files Browse the repository at this point in the history
v2023.2 did only support upgrades from v2022.x
we can therefore remove these old migrations for the next release
  • Loading branch information
maurerle committed Dec 28, 2024
1 parent e1523af commit 1db3721
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 70 deletions.
20 changes: 0 additions & 20 deletions package/gluon-core/luasrc/lib/gluon/upgrade/005-wireless-migration

This file was deleted.

21 changes: 0 additions & 21 deletions package/gluon-core/luasrc/lib/gluon/upgrade/021-interface-roles
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,6 @@ local roles = {
}
roles.single = site.interfaces.single.default_roles({unpack(roles.wan)})

-- Migration of Mesh-on-WAN/LAN setting from Gluon 2021.1 and older (to be removed in 2024)
--
-- Wired meshing is enabled for single interfaces if either of the settings
-- was previously enabled
local mesh_lan_disabled = uci:get('network_gluon-old', 'mesh_lan', 'disabled')
local mesh_wan_disabled = uci:get('network_gluon-old', 'mesh_wan', 'disabled')
if mesh_wan_disabled == '0' then
util.add_to_set(roles.wan, 'mesh')
util.add_to_set(roles.single, 'mesh')
elseif mesh_wan_disabled == '1' then
util.remove_from_set(roles.wan, 'mesh')
util.remove_from_set(roles.single, 'mesh')
end
if mesh_lan_disabled == '0' then
util.add_to_set(roles.lan, 'mesh')
util.add_to_set(roles.single, 'mesh')
elseif mesh_lan_disabled == '1' then
util.remove_from_set(roles.lan, 'mesh')
util.remove_from_set(roles.single, 'mesh')
end

-- Migration of single to WAN/LAN or vice-versa (an interface was added or removed)
-- We identify the WAN with the single interface in this case
--
Expand Down

This file was deleted.

6 changes: 0 additions & 6 deletions package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/lua

local util = require 'gluon.util'
local wireless = require 'gluon.wireless'
local site = require 'gluon.site'
local sysconfig = require 'gluon.sysconfig'
Expand Down Expand Up @@ -222,11 +221,6 @@ wireless.foreach_radio(uci, function(radio, index, config)
uci:set('wireless', radio_name, 'legacy_rates', false)
configure_mesh_wireless(radio, index, config)
elseif (band == '5g') then
-- ToDo: Remove in v2024.x
local hostapd_options = uci:get_list('wireless', radio_name, 'hostapd_options')
util.remove_from_set(hostapd_options, 'country3=0x4f')
uci:set_list('wireless', radio_name, 'hostapd_options', hostapd_options)

if is_outdoor() then
-- enforce outdoor channels by filtering the regdom for outdoor channels
uci:set('wireless', radio_name, 'country3', '0x4f')
Expand Down

0 comments on commit 1db3721

Please sign in to comment.