diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-12-20 19:02:14 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-12-20 19:02:14 +0000 |
| commit | 574eff4e8e943967e5c72f51dc6e2216cad7d755 (patch) | |
| tree | 13cca102f4568ca409510489d489ca3c658e90df /libs/core/luasrc | |
| parent | 79231d68beedb5ba1bc25a210db0eaadfdc4e5ec (diff) | |
libs/core: rework luci.model.uci.apply() to return the commandline as table, suitable for passing to nixio.exec()
Diffstat (limited to 'libs/core/luasrc')
| -rw-r--r-- | libs/core/luasrc/model/uci.lua | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libs/core/luasrc/model/uci.lua b/libs/core/luasrc/model/uci.lua index e42856bd50..a394563047 100644 --- a/libs/core/luasrc/model/uci.lua +++ b/libs/core/luasrc/model/uci.lua @@ -32,7 +32,7 @@ local table = require "table" local setmetatable, rawget, rawset = setmetatable, rawget, rawset local require, getmetatable = require, getmetatable 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. -- 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 function Cursor.apply(self, configlist, command) configlist = self:_affected(configlist) - local reloadcmd = "/sbin/luci-reload " .. table.concat(configlist, " ") - - return command and reloadcmd or os.execute(reloadcmd .. " >/dev/null 2>&1") + if command then + return { "/sbin/luci-reload", unpack(configlist) } + else + return os.execute("/sbin/luci-reload %s >/dev/null 2>&1" + % table.concat(configlist, " ")) + end end |