From 5b40265ff2314e7bb369bdd987e9d1568b6ac165 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 31 Dec 2021 23:16:15 +0100 Subject: [PATCH] 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')