From 6661ea2525eb3d43069ad01616f1f905be94029c Mon Sep 17 00:00:00 2001
From: thompsa <andy@fud.org.nz>
Date: Fri, 12 Mar 2010 13:28:14 +1300
Subject: [PATCH] Use procatat instead of ps as the latter always prints a
 header, also use full paths.

---
 etc/inc/service-utils.inc | 2 +-
 etc/inc/util.inc          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc
index 7a0eccfeb0..02b235ce37 100644
--- a/etc/inc/service-utils.inc
+++ b/etc/inc/service-utils.inc
@@ -146,7 +146,7 @@ function restart_service($name) {
 
 function is_pid_running($pidfile) {
 	$pid = trim(file_get_contents($pidfile));
-	$running = (trim(shell_exec("ps -p {$pid}")) != '');
+	$running = (trim(shell_exec("/usr/bin/procstat {$pid} 2>/dev/null")) != '');
 	return $running;
 }
 
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 686810f846..76dba778fb 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -50,7 +50,7 @@ function isvalidpid($pid) {
 }
 
 function is_process_running($process) {
-        $running = (shell_exec("pgrep -x {$process}") != '');
+        $running = (shell_exec("/bin/pgrep -x {$process}") != '');
 
         return $running;
 }