Added process control page

Minor improvements

2 files changed, 46 insertions, 1 deletions

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 4303d86eb..6f2428000 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -23,6 +23,7 @@ function index()
 	entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("a_s_changepw"), 20)
 	entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("a_s_sshkeys"), 30)
 	entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system"), 40)
+	entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("process_head"), 45)
 	entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab"), 50)
 	entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60)
 	entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 70)
@@ -85,7 +86,7 @@ function action_packages()
 	
 	
 	-- Package info
-	local info = luci.model.ipkg.info(query)
+	local info = luci.model.ipkg.info("*"..query.."*")
 	info = info or {}
 	local pkgs = {}
 	
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua b/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua
new file mode 100644
index 000000000..8ec027d11
--- /dev/null
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua
@@ -0,0 +1,44 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+f = SimpleForm("processes", translate("process_head"), translate("process_descr"))
+f.reset = false
+f.submit = false
+
+t = f:section(Table, luci.sys.process.list())
+t:option(DummyValue, "PID", translate("process_pid"))
+t:option(DummyValue, "USER", translate("process_owner"))
+t:option(DummyValue, "COMMAND", translate("process_command"))
+t:option(DummyValue, "%CPU", translate("process_cpu"))
+t:option(DummyValue, "%MEM", translate("process_mem"))
+
+hup = t:option(Button, "_hup", translate("process_hup"))
+hup.inputstyle = "reload"
+function hup.write(self, section)
+	null, self.tag_error[section] = luci.sys.process.signal(section, 1)
+end
+
+term = t:option(Button, "_term", translate("process_term"))
+term.inputstyle = "remove"
+function term.write(self, section)
+	null, self.tag_error[section] = luci.sys.process.signal(section, 15)
+end
+
+kill = t:option(Button, "_kill", translate("process_kill"))
+kill.inputstyle = "reset"
+function kill.write(self, section)
+	null, self.tag_error[section] = luci.sys.process.signal(section, 9)
+end
+
+return f
\ No newline at end of file