luci-0.10: merge r8127 and r8128

diff --git a/libs/core/luasrc/model/uci.lua b/libs/core/luasrc/model/uci.lua
index e42856bd50c2d351e499a7443fac119efcd54b06..a394563047c37e2567325d4fee0d75c08e491ab2 100644 (file)
--- 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
 
 

diff --git a/modules/admin-core/luasrc/controller/admin/servicectl.lua b/modules/admin-core/luasrc/controller/admin/servicectl.lua
index ccd54da764109d05707074670de2c3b4f1cfe9da..68a59364c2861373a2eb08e907149eae40842366 100644 (file)
--- a/modules/admin-core/luasrc/controller/admin/servicectl.lua
+++ b/modules/admin-core/luasrc/controller/admin/servicectl.lua
@@ -15,12 +15,9 @@ $Id$
 module("luci.controller.admin.servicectl", package.seeall)
 
 function index()
-       luci.i18n.loadc("base")
-       local i18n = luci.i18n.translate
-
-       entry({"servicectl"}, alias("servicectl", "status"), nil, 1).sysauth = "root"
-       entry({"servicectl", "status"}, call("action_status"), nil, 2).leaf = true
-       entry({"servicectl", "restart"}, call("action_restart"), nil, 3).leaf = true
+       entry({"servicectl"}, alias("servicectl", "status")).sysauth = "root"
+       entry({"servicectl", "status"}, call("action_status")).leaf = true
+       entry({"servicectl", "restart"}, call("action_restart")).leaf = true
 end
 
 function action_status()
@@ -34,14 +31,18 @@ function action_status()
 end
 
 function action_restart()
-       if luci.dispatcher.context.requestpath[3] then
+       local uci = require "luci.model.uci".cursor()
+       local rqp = luci.dispatcher.context.requestpath
+
+       if rqp[3] then
                local service
                local services = { }
 
-               for service in luci.dispatcher.context.requestpath[3]:gmatch("[%w_-]+") do
+               for service in rqp[3]:gmatch("[%w_-]+") do
                        services[#services+1] = service
                end
 
+               local command = uci:apply(services, true)
                if nixio.fork() == 0 then
                        local i = nixio.open("/dev/null", "r")
                        local o = nixio.open("/dev/null", "w")
@@ -52,7 +53,7 @@ function action_restart()
                        i:close()
                        o:close()
 
-                       nixio.exec("/bin/sh", "/sbin/luci-reload", unpack(services))
+                       nixio.exec("/bin/sh", unpack(command))
                else
                        luci.http.write("OK")
                        os.exit(0)