Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libs/core: rework luci.model.uci.apply() to return the commandline as table, suitable for passing to nixio.exec()

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-12-20 19:02:14 +00:00
parent 79231d68be
commit 574eff4e8e
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libs/core/luasrc/model/uci.lua
View file

@ -32,7 +32,7 @@ local table = require "table"
local setmetatable, rawget, rawset = setmetatable, rawget, rawset local setmetatable, rawget, rawset = setmetatable, rawget, rawset
local require, getmetatable = require, getmetatable local require, getmetatable = require, getmetatable
local error, pairs, ipairs = error, pairs, ipairs local error, pairs, ipairs = error, pairs, ipairs
local type, tostring, tonumber = type, tostring, tonumber local type, tostring, tonumber, unpack = type, tostring, tonumber, unpack
--- LuCI UCI model library. --- LuCI UCI model library.
-- The typical workflow for UCI is: Get a cursor instance from the -- The typical workflow for UCI is: Get a cursor instance from the
@ -69,9 +69,12 @@ local Cursor = getmetatable(inst)
-- @param command Don't apply only return the command -- @param command Don't apply only return the command
function Cursor.apply(self, configlist, command) function Cursor.apply(self, configlist, command)
configlist = self:_affected(configlist) configlist = self:_affected(configlist)
local reloadcmd = "/sbin/luci-reload " .. table.concat(configlist, " ") if command then
return { "/sbin/luci-reload", unpack(configlist) }
return command and reloadcmd or os.execute(reloadcmd .. " >/dev/null 2>&1") else
return os.execute("/sbin/luci-reload %s >/dev/null 2>&1"
% table.concat(configlist, " "))
end
end end