From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 20 Dec 2011 19:04:04 +0000 (+0000)
Subject: modules/admin-core: use luci.model.uci.apply() in service control to restart dependen... 
X-Git-Tag: 0.11.0~1202
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=45d604fea3217ec0074335ce46a5a94bf70eb9d6;p=project%2Fluci.git

modules/admin-core: use luci.model.uci.apply() in service control to restart dependencies of the current config as well
---

diff --git a/modules/admin-core/luasrc/controller/admin/servicectl.lua b/modules/admin-core/luasrc/controller/admin/servicectl.lua
index ccd54da764..68a59364c2 100644
--- 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)