luci-0.9: merge r5605

diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
index 97fe88e6c20364be6ad12ff6a4c24a2989a90fef..5ab232c78a20f2dc641948a3217b2c447990d7ec 100644 (file)
--- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
+++ b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
@@ -18,18 +18,6 @@ s = m:section(NamedSection, "config", "upnpd", "")
 e = s:option(Flag, "enabled", translate("enable"))
 e.rmempty = false
 
-function e.write(self, section, value)
-       local cmd = (value == "1") and "enable" or "disable"
-       if value ~= "1" then
-               os.execute("/etc/init.d/miniupnpd stop")
-       end
-       os.execute("/etc/init.d/miniupnpd " .. cmd)
-end
-
-function e.cfgvalue(self, section)
-       return (os.execute("/etc/init.d/miniupnpd enabled") == 0) and "1" or "0"
-end
-
 s:option(Flag, "secure_mode").rmempty = true
 s:option(Flag, "log_output").rmempty = true
 s:option(Value, "download", nil, "kByte/s").rmempty = true

diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua b/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
index 3e19b9573447356fabac0caade650bf367a8a4ea..f39917f3897ed04bd2e6620fa5ae59cbd1ad7c9e 100644 (file)
--- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
+++ b/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
@@ -18,18 +18,6 @@ s = m:section(NamedSection, "config", "upnpd", "")
 e = s:option(Flag, "enabled", translate("enable"))
 e.rmempty = false
 
-function e.write(self, section, value)
-       local cmd = (value == "1") and "enable" or "disable"
-       if value ~= "1" then
-               os.execute("/etc/init.d/miniupnpd stop")
-       end
-       os.execute("/etc/init.d/miniupnpd " .. cmd)
-end
-
-function e.cfgvalue(self, section)
-       return (os.execute("/etc/init.d/miniupnpd enabled") == 0) and "1" or "0"
-end
-
 s:option(Value, "download", nil, "kByte/s").rmempty = true
 s:option(Value, "upload", nil, "kByte/s").rmempty = true