From: Markus Wigge <markus@cultcom.de>
Date: Tue, 11 Aug 2009 15:41:53 +0000 (+0000)
Subject: - fixed path to OpenVPN PID file
X-Git-Tag: 0.10.0~1208
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=59d70787b46bcff4e2032f5b82bd68c0b62f3e7c

- fixed path to OpenVPN PID file
- fixed syntax for translatef call
---

diff --git a/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
index e71becd06..c220b10a5 100644
--- a/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
+++ b/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
@@ -70,10 +70,10 @@ s:option( Flag, "enable", translate("openvpn_enable") )
 
 local active = s:option( DummyValue, "_active", translate("openvpn_active") )
 function active.cfgvalue(self, section)
-	local pid = fs.readfile("/var/run/openvpn_%s.pid" % section)
+	local pid = fs.readfile("/var/run/openvpn-%s.pid" % section)
 	if pid and #pid > 0 and tonumber(pid) ~= nil then
 		return (sys.process.signal(pid, 0))
-			and translatef("openvpn_active_yes", pid)
+			and translatef("openvpn_active_yes", "yes (%i)", pid)
 			or  translate("openvpn_active_no")
 	end
 	return translate("openvpn_active_no")