From 65d7491f0e433376e02e9cfd32be63c853ca03bc Mon Sep 17 00:00:00 2001
From: Mika Havela <mika.havela@gmail.com>
Date: Wed, 9 Apr 2008 13:25:00 +0000
Subject: Cleaning up the code.

git-svn-id: svn://svn.alpinelinux.org/acf/dhcp/trunk@968 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 dhcp-model.lua | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/dhcp-model.lua b/dhcp-model.lua
index 84fe35c..2dd0831 100644
--- a/dhcp-model.lua
+++ b/dhcp-model.lua
@@ -7,6 +7,7 @@ require("procps")
 require("validator")
 require("daemoncontrol")
 require("procps")
+require("processinfo")
 
 local subnet = {}
 local cfgdir = "/etc/dhcp/"
@@ -16,28 +17,6 @@ local packagename = "dhcp"
 -- ################################################################################
 -- LOCAL FUNCTIONS
 
-local function get_version()
-	local cmd = "/sbin/apk_version -v -s " .. packagename .. " | cut -d ' ' -f 1"
-	local cmd_output = io.popen( cmd )
-	local cmd_output_result = cmd_output:read("*a") or ""
-	cmd_output:close()
-	return cmd_output_result
-end
-
-local function autostarts()
-	local cmd_output_result
-	local cmd = "/sbin/rc_status | egrep '^S' | egrep '" .. processname .."' 2>/dev/null"
-	local f = io.popen( cmd )
-	local cmdresult = f:read("*a")
-	if (cmdresult) and (#cmdresult > 0) then
-		cmd_output_result = "Process will autostart at next boot (at sequence '" .. string.match(cmdresult,"^%a+(%d%d)") .. "')"
-	else
-		cmd_output_error = "Not programmed to autostart"
-	end	
-	f:close()
-	return cmd_output_result, cmd_output_error
-end
-
 function process_status_text(procname)
 	local t = procps.pidof(procname)
 	if (t) and (#t > 0) then
@@ -52,19 +31,19 @@ end
 function getstatus ()
 	local status = {}
 
-	status.version = cfe({ 
-		name = "version",
+	local value, errtxt = processinfo.package_version(packagename)
+	status.version = cfe({ name = "version",
 		label="Program version",
-		value=get_version(),
+		value=value,
+		errtxt=errtxt,
 		 })
 
-	status.status = cfe({ 
-		name="status",
+	status.status = cfe({ name="status",
 		label="Program status",
 		value=process_status_text(processname),
 		})
 
-	local autostart_sequense, autostart_errtxt = autostarts()
+	local autostart_sequense, autostart_errtxt = processinfo.process_botsequence(processname)
 	status.autostart = cfe({ name="autostart",
 		label="Autostart sequence",
 		value=autostart_sequense,
-- 
cgit v1.2.3