summaryrefslogtreecommitdiffstats
path: root/openvpn-model.lua
diff options
context:
space:
mode:
authorMika Havela <mika.havela@gmail.com>2008-01-15 08:10:33 +0000
committerMika Havela <mika.havela@gmail.com>2008-01-15 08:10:33 +0000
commit8d0ffe2097ba6b52efc17f53a05370d0b7d1129a (patch)
tree380117c9b30e13a8f26a481ee67a4b57e141ca73 /openvpn-model.lua
parent4eabe9c9300202106a51233e31f5567a6a75d9f2 (diff)
downloadacf-openvpn-8d0ffe2097ba6b52efc17f53a05370d0b7d1129a.tar.bz2
acf-openvpn-8d0ffe2097ba6b52efc17f53a05370d0b7d1129a.tar.xz
Bugfix when /etc/openvpn/ folder doesn't exist
git-svn-id: svn://svn.alpinelinux.org/acf/openvpn/trunk@570 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'openvpn-model.lua')
-rw-r--r--openvpn-model.lua17
1 files changed, 10 insertions, 7 deletions
diff --git a/openvpn-model.lua b/openvpn-model.lua
index 32fc33b..aefadff 100644
--- a/openvpn-model.lua
+++ b/openvpn-model.lua
@@ -3,6 +3,7 @@ module (..., package.seeall)
require ("posix")
require ("format")
require ("fs")
+require ("procps")
local baseurl = "/etc/openvpn/"
@@ -55,13 +56,15 @@ end
local is_running = function( process, parameters )
- local strsplit = require("split")
+-- local strsplit = require("split")
local retval = ""
- local tst = ""
- local pidofsx, error = io.popen("pidof " .. process ,r)
- local pidofs = string.gsub(pidofsx:read("*a"), "\n", "")
- pidofsx:close()
- for v in string.gmatch(pidofs, "%S+") do
+-- local tst = ""
+-- local pidofsx, error = io.popen("pidof " .. process ,r)
+-- local pidofs = string.gsub(pidofsx:read("*a"), "\n", "")
+-- pidofsx:close()
+-- for v in string.gmatch(pidofs, "%S+") do
+ local i,v
+ for i,v in ipairs(procps.pidof(process) or {}) do
local path = string.gsub("/proc/".. v .. "/cmdline", "%s", "")
local f,err = io.open(path,r)
local file_resultx = f:read("*a")
@@ -277,7 +280,7 @@ end
function get_conflist ()
local configlist = {}
- for k,v in pairs(list_conffiles()) do
+ for k,v in pairs(list_conffiles() or {}) do
config = config_content ( v.name )
local conf_type, err = check_valid_config ( v.name )
local isrunning = is_running ("openvpn", v.name)