From 16bf5e3e5d02b43aa3158715c8cb1590b05be04b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 29 Dec 2021 22:59:42 +0100 Subject: [PATCH 1/6] gluon-core: remove obsolete sysconfig.gluon_version handling The file /lib/gluon/version/core hasn't existed since early 2014, so this whole script is obsolete. --- .../gluon-core/luasrc/lib/gluon/upgrade/001-upgrade | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100755 package/gluon-core/luasrc/lib/gluon/upgrade/001-upgrade diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/001-upgrade b/package/gluon-core/luasrc/lib/gluon/upgrade/001-upgrade deleted file mode 100755 index f4897d18..00000000 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/001-upgrade +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/lua - -local sysconfig = require 'gluon.sysconfig' -local unistd = require 'posix.unistd' - - -if unistd.access('/lib/gluon/version/core') and not sysconfig.gluon_version then - -- This isn't an initial upgrade, so set gluon_version - sysconfig.gluon_version = '' -end From bae14abca4b4aa41a4eab6fb22f42fdb9deb39f1 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 31 Dec 2021 22:10:54 +0100 Subject: [PATCH 2/6] gluon-core: remove obsolete proto 'batadv' -> 'gluon_mesh' migration More migration code from 2016. --- .../lib/gluon/upgrade/800-migrate-batadv | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100755 package/gluon-core/luasrc/lib/gluon/upgrade/800-migrate-batadv diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/800-migrate-batadv b/package/gluon-core/luasrc/lib/gluon/upgrade/800-migrate-batadv deleted file mode 100755 index ddd03c0a..00000000 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/800-migrate-batadv +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/lua - -local uci = require('simple-uci').cursor() - -local function migrate_iface(iface) - if iface.proto ~= 'batadv' or iface.mesh ~= 'bat0' then - return - end - - local s = iface['.name'] - - uci:set('network', s, 'proto', 'gluon_mesh') - uci:set('network', s, 'fixed_mtu', true) - - if iface.mesh_no_rebroadcast then - uci:set('network', s, 'transitive', iface.mesh_no_rebroadcast) - end - - uci:delete('network', s, 'mesh') - uci:delete('network', s, 'mesh_no_rebroadcast') -end - -uci:foreach('network', 'interface', migrate_iface) -uci:save('network') From 5b40265ff2314e7bb369bdd987e9d1568b6ac165 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 31 Dec 2021 23:16:15 +0100 Subject: [PATCH 3/6] gluon-mesh-batman-adv: remove obsolete migration code --- .../luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh | 6 +----- .../gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge | 6 ------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh index 9ba1289f..40943207 100755 --- a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh +++ b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh @@ -6,14 +6,10 @@ local util = require 'gluon.util' local uci = require('simple-uci').cursor() -local gw_mode = uci:get('network', 'gluon_bat0', 'gw_mode') or uci:get('network', 'bat0', 'gw_mode') or 'client' - -uci:delete('batman-adv-legacy', 'bat0') -uci:save('batman-adv-legacy') - uci:delete('batman-adv', 'bat0') uci:save('batman-adv') +local gw_mode = uci:get('network', 'gluon_bat0', 'gw_mode') or 'client' uci:delete('network', 'gluon_bat0') uci:section('network', 'interface', 'gluon_bat0', { proto = 'gluon_bat0', diff --git a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge index 2f113ece..fc14a6e6 100755 --- a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge +++ b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge @@ -21,10 +21,6 @@ uci:section('network', 'interface', 'client', { query_response_interval = 500, }) -uci:delete('network', 'client_lan') - -uci:delete('network', 'local_node_route') - uci:delete('network', 'local_node_route6') uci:section('network', 'route6', 'local_node_route6', { interface = 'client', @@ -42,6 +38,4 @@ networks = uci:get_list('firewall', 'drop', 'network') util.remove_from_set(networks, 'client') uci:set_list('firewall', 'drop', 'network', networks) -uci:delete('firewall', 'local_node_dns') - uci:save('firewall') From 971291290458f6c227081085d7eb68799c765fa4 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 31 Dec 2021 23:22:14 +0100 Subject: [PATCH 4/6] gluon-l3roamd: remove obsolete migration code --- .../luasrc/lib/gluon/upgrade/380-gluon-l3roamd-route | 7 ------- 1 file changed, 7 deletions(-) delete mode 100755 package/gluon-l3roamd/luasrc/lib/gluon/upgrade/380-gluon-l3roamd-route diff --git a/package/gluon-l3roamd/luasrc/lib/gluon/upgrade/380-gluon-l3roamd-route b/package/gluon-l3roamd/luasrc/lib/gluon/upgrade/380-gluon-l3roamd-route deleted file mode 100755 index d425252c..00000000 --- a/package/gluon-l3roamd/luasrc/lib/gluon/upgrade/380-gluon-l3roamd-route +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/lua -local uci = require('simple-uci').cursor() - -uci:delete('network', 'l3roam') -uci:delete('network', 'l3roamd_client') - -uci:save('network') From 97ef7889c660579f1b6676a6e04d88868e0db7ad Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 1 Jan 2022 01:45:52 +0100 Subject: [PATCH 5/6] gluon-core: remove more obsolete migrations --- package/gluon-core/luasrc/lib/gluon/upgrade/210-interface-wan | 4 ---- package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan | 4 ---- 2 files changed, 8 deletions(-) diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/210-interface-wan b/package/gluon-core/luasrc/lib/gluon/upgrade/210-interface-wan index 051b213e..cf6eff71 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/210-interface-wan +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/210-interface-wan @@ -22,8 +22,4 @@ if uci:get('network', 'mesh_wan', 'transitive') == nil then uci:set('network', 'mesh_wan', 'transitive', true) end -uci:delete('network', 'mesh_wan', 'auto') -uci:delete('network', 'mesh_wan', 'fixed_mtu') -uci:delete('network', 'mesh_wan', 'legacy') - uci:save('network') diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan b/package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan index 19ccfb49..55586435 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan @@ -50,8 +50,4 @@ if uci:get('network', 'mesh_lan', 'transitive') == nil then uci:set('network', 'mesh_lan', 'transitive', true) end -uci:delete('network', 'mesh_lan', 'auto') -uci:delete('network', 'mesh_lan', 'fixed_mtu') -uci:delete('network', 'mesh_lan', 'legacy') - uci:save('network') From eaac48e20def7295c20cd2b287016e98cf6fdc28 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 1 Jan 2022 01:46:19 +0100 Subject: [PATCH 6/6] gluon-mesh-vpn-fastd: remove obsolete migration --- .../luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd | 1 - 1 file changed, 1 deletion(-) diff --git a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd index b59ef2c7..4d56be2a 100755 --- a/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd +++ b/package/gluon-mesh-vpn-fastd/luasrc/lib/gluon/upgrade/400-mesh-vpn-fastd @@ -46,7 +46,6 @@ uci:section('fastd', 'fastd', 'mesh_vpn', { packet_mark = 1, status_socket = '/var/run/fastd.mesh_vpn.socket', }) -uci:delete('fastd', 'mesh_vpn', 'user') -- Collect list of groups that have peers with 'preserve' flag