From 4658afb2c6d50f17f0be2c7b346551d94019ff01 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 2 Apr 2016 18:54:33 +0200
Subject: [PATCH] gluon-core: commit all UCI configs at the end
Avoid commiting configs inbetween to decrease number of flash writes.
Fixes #714.
---
.../gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred | 1 -
.../gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater | 1 -
.../files/lib/gluon/upgrade/300-gluon-client-bridge-network | 1 -
.../files/lib/gluon/upgrade/320-gluon-client-bridge-wireless | 1 -
package/gluon-core/files/lib/gluon/upgrade/020-interfaces | 1 -
package/gluon-core/files/lib/gluon/upgrade/030-system | 1 -
package/gluon-core/files/lib/gluon/upgrade/110-network | 2 --
package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers | 1 -
package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules | 1 -
package/gluon-core/files/lib/gluon/upgrade/200-wireless | 1 -
package/gluon-core/files/lib/gluon/upgrade/998-commit | 3 +++
.../files/lib/gluon/upgrade/019-legacy-interfaces | 1 -
.../gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless | 1 -
.../files/lib/gluon/upgrade/290-legacy-setup-mode | 2 --
.../gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc | 1 -
.../files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd | 1 -
.../files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14 | 1 -
.../files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15 | 1 -
.../lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan | 1 -
.../lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh | 4 ----
.../lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless | 2 --
.../gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan | 1 -
.../gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan | 1 -
.../lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid | 1 -
.../files/lib/gluon/upgrade/400-mesh-vpn-fastd | 3 ---
.../lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret | 1 -
.../files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc | 1 -
.../files/lib/gluon/upgrade/400-neighbour-info-firewall | 1 -
package/gluon-next-node/files/lib/gluon/upgrade/400-next-node | 2 --
.../files/lib/gluon/upgrade/500-node-info-system | 1 -
.../files/lib/gluon/upgrade/510-node-info-role | 1 -
.../files/lib/gluon/upgrade/400-respondd-firewall | 1 -
.../gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode | 1 -
.../files/lib/gluon/upgrade/310-setup-mode-migrate | 1 -
.../files/lib/gluon/upgrade/500-status-page-api | 2 --
35 files changed, 3 insertions(+), 44 deletions(-)
create mode 100755 package/gluon-core/files/lib/gluon/upgrade/998-commit
diff --git a/package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred b/package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred
index 8c52d8a6c..d3802d8a4 100755
--- a/package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred
+++ b/package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred
@@ -16,4 +16,3 @@ c:section('alfred', 'alfred', 'alfred',
)
c:save('alfred')
-c:commit('alfred')
diff --git a/package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater b/package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater
index b569f24e0..17006b700 100755
--- a/package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater
+++ b/package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater
@@ -40,7 +40,6 @@ end
c:set('autoupdater', 'settings', 'version_file', '/lib/gluon/release')
c:save('autoupdater')
-c:commit('autoupdater')
local autoupdater_util = require 'autoupdater.util'
diff --git a/package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network b/package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network
index 5ee558cf7..4a897f74e 100755
--- a/package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network
+++ b/package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network
@@ -24,4 +24,3 @@ end
uci:set('network', 'client', 'macaddr', sysconfig.primary_mac)
uci:save('network')
-uci:commit('network')
diff --git a/package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless b/package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless
index 4eaccacb5..8d5c7181f 100755
--- a/package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless
+++ b/package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless
@@ -45,4 +45,3 @@ end
util.iterate_radios(configure_radio)
uci:save('wireless')
-uci:commit('wireless')
diff --git a/package/gluon-core/files/lib/gluon/upgrade/020-interfaces b/package/gluon-core/files/lib/gluon/upgrade/020-interfaces
index a051c738d..1818ad00b 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/020-interfaces
+++ b/package/gluon-core/files/lib/gluon/upgrade/020-interfaces
@@ -32,5 +32,4 @@ if not (sysconfig.lan_ifname or sysconfig.wan_ifname) then
uci:delete('network', 'wan')
uci:save('network')
- uci:commit('network')
end
diff --git a/package/gluon-core/files/lib/gluon/upgrade/030-system b/package/gluon-core/files/lib/gluon/upgrade/030-system
index d7a666050..0086a5dca 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/030-system
+++ b/package/gluon-core/files/lib/gluon/upgrade/030-system
@@ -14,5 +14,4 @@ if not sysconfig.gluon_version then
uci:set('system', system, 'timezone', site.timezone)
uci:save('system')
- uci:commit('system')
end
diff --git a/package/gluon-core/files/lib/gluon/upgrade/110-network b/package/gluon-core/files/lib/gluon/upgrade/110-network
index 5de2f1f45..bf87d47f4 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/110-network
+++ b/package/gluon-core/files/lib/gluon/upgrade/110-network
@@ -53,7 +53,6 @@ uci:section('network', 'route6', 'wan6_unreachable',
)
uci:save('network')
-uci:commit('network')
uci:section('firewall', 'rule', 'wan_igmp',
@@ -79,7 +78,6 @@ uci:section('firewall', 'rule', 'wan_mld',
)
uci:save('firewall')
-uci:commit('firewall')
sysctl.set('net.ipv6.conf.all.accept_ra', 0)
diff --git a/package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers b/package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers
index 2b3a2df61..f38c1f5d0 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers
+++ b/package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers
@@ -11,4 +11,3 @@ local c = uci.cursor()
c:delete('system', 'ntp', 'server')
c:set_list('system', 'ntp', 'server', site.ntp_servers)
c:save('system')
-c:commit('system')
diff --git a/package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules b/package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules
index 792e06a2c..abd453818 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules
+++ b/package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules
@@ -27,4 +27,3 @@ c:section('firewall', 'rule', 'wan_ssh',
)
c:save('firewall')
-c:commit('firewall')
diff --git a/package/gluon-core/files/lib/gluon/upgrade/200-wireless b/package/gluon-core/files/lib/gluon/upgrade/200-wireless
index 2ada9b3cc..5a4ec0a47 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/200-wireless
+++ b/package/gluon-core/files/lib/gluon/upgrade/200-wireless
@@ -33,4 +33,3 @@ end
util.iterate_radios(configure_radio)
uci:save('wireless')
-uci:commit('wireless')
diff --git a/package/gluon-core/files/lib/gluon/upgrade/998-commit b/package/gluon-core/files/lib/gluon/upgrade/998-commit
new file mode 100755
index 000000000..5f1f7332b
--- /dev/null
+++ b/package/gluon-core/files/lib/gluon/upgrade/998-commit
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+uci commit
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces b/package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces
index b48e42b87..691e4ad70 100755
--- a/package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces
+++ b/package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces
@@ -34,7 +34,6 @@ if sysconfig.gluon_version == 'legacy' then
uci:delete('network', 'wan')
uci:save('network')
- uci:commit('network')
end
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless b/package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless
index 36da0632a..d8fd17209 100755
--- a/package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless
+++ b/package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless
@@ -20,5 +20,4 @@ if sysconfig.gluon_version == 'legacy' then
uci:delete_all('wireless', 'wifi-iface', delete_legacy_iface)
uci:save('wireless')
- uci:commit('wireless')
end
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode b/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode
index 0b97e1209..d2a674844 100755
--- a/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode
+++ b/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode
@@ -12,9 +12,7 @@ if sysconfig.gluon_version == 'legacy' then
if old == '1' then
local setup_mode = uci:get_first('gluon-setup-mode', 'setup_mode')
uci:set('gluon-setup-mode', setup_mode, 'configured', '1')
-
uci:save('gluon-setup-mode')
- uci:commit('gluon-setup-mode')
break
end
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc b/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc
index 566218878..652c53c95 100755
--- a/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc
+++ b/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc
@@ -21,7 +21,6 @@ if sysconfig.gluon_version == 'legacy' then
)
uci:save('simple-tc')
- uci:commit('simple-tc')
break
end
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd b/package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
index 468a35a65..21f95e07c 100755
--- a/package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
+++ b/package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
@@ -33,5 +33,4 @@ if sysconfig.gluon_version == 'legacy' then
end
uci:save('fastd')
- uci:commit('fastd')
end
diff --git a/package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14 b/package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
index 05776c30f..30e2682b5 100755
--- a/package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
+++ b/package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
@@ -45,4 +45,3 @@ end
uci:save('network')
-uci:commit('network')
diff --git a/package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15 b/package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
index f9f540033..7148d42ce 100755
--- a/package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
+++ b/package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
@@ -45,4 +45,3 @@ end
uci:save('network')
-uci:commit('network')
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
index c9084ea67..00b164147 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
@@ -7,5 +7,4 @@ local uci = require('luci.model.uci').cursor()
-- fix up duplicate mac addresses (for mesh-on-WAN)
uci:set('network', 'wan', 'macaddr', util.generate_mac(1, 0))
uci:save('network')
-uci:commit('network')
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
index 0843e9373..d9999456d 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
@@ -24,7 +24,6 @@ uci:section('batman-adv', 'mesh', 'bat0',
}
)
uci:save('batman-adv')
-uci:commit('batman-adv')
if not uci:get('network', 'client', 'ifname') then
uci:add_to_set('network', 'client', 'ifname', 'bat0')
@@ -53,7 +52,6 @@ uci:section('network', 'interface', 'bat0',
)
uci:save('network')
-uci:commit('network')
uci:delete('firewall', 'client')
@@ -77,7 +75,6 @@ uci:section('firewall', 'rule', 'client_dns',
)
uci:save('firewall')
-uci:commit('firewall')
local dnsmasq = uci:get_first('dhcp', 'dnsmasq')
@@ -94,7 +91,6 @@ uci:section('dhcp', 'dhcp', 'client',
)
uci:save('dhcp')
-uci:commit('dhcp')
sysctl.set('net.ipv6.conf.br-client.forwarding', 0)
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
index 8835c9973..a73912b86 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
@@ -131,5 +131,3 @@ util.iterate_radios(configure_radio)
uci:save('wireless')
uci:save('network')
-uci:commit('wireless')
-uci:commit('network')
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
index 8db951451..7a964ee28 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
@@ -16,4 +16,3 @@ if not c:get('network', 'mesh_wan') then
end
c:save('network')
-c:commit('network')
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
index 8b192adbd..27c1935bb 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
@@ -33,5 +33,4 @@ if sysconfig.lan_ifname and not uci:get('network', 'mesh_lan') then
})
uci:save('network')
- uci:commit('network')
end
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
index 5ddb4f900..10b671713 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
@@ -6,5 +6,4 @@ if uci:get('system', 'rssid_wlan0') then
uci:set('system', 'rssid_wlan0', 'dev', 'mesh0')
uci:save('system')
- uci:commit('system')
end
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd
index 316546bc9..902f1ccd2 100755
--- a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd
+++ b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd
@@ -119,7 +119,6 @@ add_groups('mesh_vpn', site.fastd_mesh_vpn.groups)
uci:save('fastd')
-uci:commit('fastd')
uci:section('network', 'interface', 'mesh_vpn',
@@ -133,7 +132,6 @@ uci:section('network', 'interface', 'mesh_vpn',
)
uci:save('network')
-uci:commit('network')
uci:section('firewall', 'include', 'mesh_vpn_dns',
@@ -145,4 +143,3 @@ uci:section('firewall', 'include', 'mesh_vpn_dns',
)
uci:save('firewall')
-uci:commit('firewall')
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret
index 68a2fe676..e581dea8b 100755
--- a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret
+++ b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret
@@ -9,5 +9,4 @@ local secret = c:get("fastd", "mesh_vpn", "secret")
if not secret or not secret:match(("%x"):rep(64)) then
c:set("fastd", "mesh_vpn", "secret", "generate")
c:save("fastd")
- c:commit("fastd")
end
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc
index d4cfcddea..3c3e10a45 100755
--- a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc
+++ b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc
@@ -28,5 +28,4 @@ if not uci:get('simple-tc', 'mesh_vpn') then
uci:section('simple-tc', 'interface', 'mesh_vpn', config)
uci:save('simple-tc')
- uci:commit('simple-tc')
end
diff --git a/package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall b/package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall
index a6d7f4908..373f166a5 100755
--- a/package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall
+++ b/package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall
@@ -17,4 +17,3 @@ uci:section('firewall', 'rule', 'wan_respondd_reply',
)
uci:save('firewall')
-uci:commit('firewall')
diff --git a/package/gluon-next-node/files/lib/gluon/upgrade/400-next-node b/package/gluon-next-node/files/lib/gluon/upgrade/400-next-node
index 0ff959fe7..79cc03690 100755
--- a/package/gluon-next-node/files/lib/gluon/upgrade/400-next-node
+++ b/package/gluon-next-node/files/lib/gluon/upgrade/400-next-node
@@ -39,7 +39,6 @@ c:section('network', 'route6', 'local_node_route6',
)
c:save('network')
-c:commit('network')
c:delete('firewall', 'local_node')
c:section('firewall', 'zone', 'local_node',
@@ -52,4 +51,3 @@ c:section('firewall', 'zone', 'local_node',
}
)
c:save('firewall')
-c:commit('firewall')
diff --git a/package/gluon-node-info/files/lib/gluon/upgrade/500-node-info-system b/package/gluon-node-info/files/lib/gluon/upgrade/500-node-info-system
index a17b94617..a70eb2825 100755
--- a/package/gluon-node-info/files/lib/gluon/upgrade/500-node-info-system
+++ b/package/gluon-node-info/files/lib/gluon/upgrade/500-node-info-system
@@ -7,5 +7,4 @@ local config = 'gluon-node-info'
if not uci:get_first(config, 'system') then
uci:section(config, 'system')
uci:save(config)
- uci:commit(config)
end
diff --git a/package/gluon-node-info/files/lib/gluon/upgrade/510-node-info-role b/package/gluon-node-info/files/lib/gluon/upgrade/510-node-info-role
index 6e54a2346..06d42f8e2 100755
--- a/package/gluon-node-info/files/lib/gluon/upgrade/510-node-info-role
+++ b/package/gluon-node-info/files/lib/gluon/upgrade/510-node-info-role
@@ -15,5 +15,4 @@ end
if not role then
uci:set(config, uci:get_first(config, 'system'), 'role', default_role)
uci:save(config)
- uci:commit(config)
end
diff --git a/package/gluon-respondd/files/lib/gluon/upgrade/400-respondd-firewall b/package/gluon-respondd/files/lib/gluon/upgrade/400-respondd-firewall
index c50768303..a78cfb3d3 100755
--- a/package/gluon-respondd/files/lib/gluon/upgrade/400-respondd-firewall
+++ b/package/gluon-respondd/files/lib/gluon/upgrade/400-respondd-firewall
@@ -29,4 +29,3 @@ uci:section('firewall', 'rule', 'client_respondd',
)
uci:save('firewall')
-uci:commit('firewall')
diff --git a/package/gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode b/package/gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode
index ae59c7aaa..481a4fa0e 100755
--- a/package/gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode
+++ b/package/gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode
@@ -11,6 +11,5 @@ if site.setup_mode
local name = c:get_first("gluon-setup-mode", "setup_mode")
c:set("gluon-setup-mode", name, "configured", 1)
c:save('gluon-setup-mode')
- c:commit('gluon-setup-mode')
end
diff --git a/package/gluon-setup-mode/files/lib/gluon/upgrade/310-setup-mode-migrate b/package/gluon-setup-mode/files/lib/gluon/upgrade/310-setup-mode-migrate
index 9d3b9b0aa..3b5165c44 100755
--- a/package/gluon-setup-mode/files/lib/gluon/upgrade/310-setup-mode-migrate
+++ b/package/gluon-setup-mode/files/lib/gluon/upgrade/310-setup-mode-migrate
@@ -12,7 +12,6 @@ if old == '1' then
c:set('gluon-setup-mode', setup_mode, 'configured', '1')
c:save('gluon-setup-mode')
- c:commit('gluon-setup-mode')
end
os.remove('/etc/config/gluon-config-mode')
diff --git a/package/gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api b/package/gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api
index a5000012d..a11fac9b4 100755
--- a/package/gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api
+++ b/package/gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api
@@ -10,6 +10,4 @@ uci batch <<-EOF
set uhttpd.main.home=/lib/gluon/status-page/www
set uhttpd.main.max_requests=32
-
- commit uhttpd
EOF
--
GitLab