Skip to content
Snippets Groups Projects
Unverified Commit 6cf03bab authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

treewide: replace normal uses of luci.model.uci with simple-uci to reduce LuCI dependencies

We also make use of the boolean support of simple-uci to make scripts
clearer.
parent 6f48fc42
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/lua #!/usr/bin/lua
local uci = require('luci.model.uci').cursor() local uci = require('simple-uci').cursor()
local config = 'gluon-node-info' local config = 'gluon-node-info'
......
#!/usr/bin/lua #!/usr/bin/lua
local site = require 'gluon.site_config' local site = require 'gluon.site_config'
local uci = require('luci.model.uci').cursor() local uci = require('simple-uci').cursor()
local config = 'gluon-node-info' local config = 'gluon-node-info'
local role = uci:get(config, uci:get_first(config, 'system'), 'role') local role = uci:get(config, uci:get_first(config, 'system'), 'role')
......
#!/usr/bin/lua #!/usr/bin/lua
local uci = require('luci.model.uci').cursor() local uci = require('simple-uci').cursor()
require 'luci.util'
local sname = uci:get_first('gluon-node-info', 'location') local sname = uci:get_first('gluon-node-info', 'location')
if sname then if sname then
......
#!/usr/bin/lua #!/usr/bin/lua
local uci = require('luci.model.uci').cursor() local uci = require('simple-uci').cursor()
uci:delete('firewall', 'wan_announced') uci:delete('firewall', 'wan_announced')
......
#!/usr/bin/lua #!/usr/bin/lua
local site = require 'gluon.site_config' local site = require 'gluon.site_config'
local uci = require 'luci.model.uci' local uci = require('simple-uci').cursor()
local c = uci.cursor()
if site.setup_mode if site.setup_mode
and site.setup_mode.skip and site.setup_mode.skip
and not c:get_first('gluon-setup-mode', 'setup_mode', 'configured', false) then and not uci:get_first('gluon-setup-mode', 'setup_mode', 'configured', false) then
local name = c:get_first("gluon-setup-mode", "setup_mode") local name = uci:get_first("gluon-setup-mode", "setup_mode")
c:set("gluon-setup-mode", name, "configured", 1) uci:set("gluon-setup-mode", name, "configured", true)
c:save('gluon-setup-mode') uci:save('gluon-setup-mode')
end end
#!/usr/bin/lua #!/usr/bin/lua
local uci = require 'luci.model.uci' local uci = require('simple-uci').cursor()
local c = uci.cursor()
local old = uci:get_first('gluon-config-mode', 'wizard', 'configured')
local old = c:get_first('gluon-config-mode', 'wizard', 'configured')
if old == '1' then if old == '1' then
local setup_mode = c:get_first('gluon-setup-mode', 'setup_mode') local setup_mode = uci:get_first('gluon-setup-mode', 'setup_mode')
c:set('gluon-setup-mode', setup_mode, 'configured', '1') uci:set('gluon-setup-mode', setup_mode, 'configured', true)
c:save('gluon-setup-mode') uci:save('gluon-setup-mode')
end end
os.remove('/etc/config/gluon-config-mode') os.remove('/etc/config/gluon-config-mode')
...@@ -5,7 +5,7 @@ local RESOLV_CONF = RESOLV_CONF_DIR .. '/resolv.conf' ...@@ -5,7 +5,7 @@ local RESOLV_CONF = RESOLV_CONF_DIR .. '/resolv.conf'
local ubus = require('ubus').connect() local ubus = require('ubus').connect()
local uci = require('luci.model.uci').cursor() local uci = require('simple-uci').cursor()
local fs = require 'nixio.fs' local fs = require 'nixio.fs'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment