From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sun, 26 Feb 2017 18:25:33 +0000 (+0200)
Subject: Merge pull request #1005 from kdarbyshirebryant/miniupnpenable
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=0f474fc3027154cdc94db4a5bafd54263875f001;hp=6e2647a9d6b9c0eef53dff1c2049981befd17d31;p=project%2Fluci.git

Merge pull request #1005 from kdarbyshirebryant/miniupnpenable

luci-minuupnpd: use enable flag
---

diff --git a/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua b/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua
index f1bb450dd..74b9d1d03 100644
--- a/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua
+++ b/applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua
@@ -12,21 +12,21 @@ s.addremove = false
 s:tab("general",  translate("General Settings"))
 s:tab("advanced", translate("Advanced Settings"))
 
-e = s:taboption("general", Flag, "_init", translate("Start UPnP and NAT-PMP service"))
+e = s:taboption("general", Flag, "enabled", translate("Start UPnP and NAT-PMP service"))
 e.rmempty  = false
 
-function e.cfgvalue(self, section)
-	return luci.sys.init.enabled("miniupnpd") and self.enabled or self.disabled
-end
+--function e.cfgvalue(self, section)
+--	return luci.sys.init.enabled("miniupnpd") and self.enabled or self.disabled
+--end
 
 function e.write(self, section, value)
 	if value == "1" then
-		luci.sys.call("/etc/init.d/miniupnpd enable >/dev/null")
 		luci.sys.call("/etc/init.d/miniupnpd start >/dev/null")
 	else
 		luci.sys.call("/etc/init.d/miniupnpd stop >/dev/null")
-		luci.sys.call("/etc/init.d/miniupnpd disable >/dev/null")
 	end
+
+	return Flag.write(self, section, value)
 end
 
 s:taboption("general", Flag, "enable_upnp", translate("Enable UPnP functionality")).default = "1"