From 8d0ffe2097ba6b52efc17f53a05370d0b7d1129a Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Tue, 15 Jan 2008 08:10:33 +0000 Subject: Bugfix when /etc/openvpn/ folder doesn't exist git-svn-id: svn://svn.alpinelinux.org/acf/openvpn/trunk@570 ab2d0c66-481e-0410-8bed-d214d4d58bed --- openvpn-model.lua | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'openvpn-model.lua') 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) -- cgit v1.2.3