summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-08-31 19:53:51 +0000
committerErmal <eri@pfsense.org>2010-08-31 19:53:51 +0000
commit01d4b621bde12f7de67b60b05f0f9e34fd8745f7 (patch)
treec3239335867517d6775a01ad8b49794ad0b5babb /etc
parent9eda72592e6b4e92ed35d5382683c576395d4c62 (diff)
downloadpfsense-01d4b621bde12f7de67b60b05f0f9e34fd8745f7.zip
pfsense-01d4b621bde12f7de67b60b05f0f9e34fd8745f7.tar.gz
Use exec() for is_process_running since system() displays command output(not sure why). Also handle captiveportal specially and use proper function to start/stop it.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/util.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 0e73ab8..96d10f5 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -50,7 +50,8 @@ function isvalidpid($pid) {
}
function is_process_running($process) {
- system("/bin/pgrep -x {$process}", $retval);
+ $output = "";
+ exec("/bin/pgrep -x {$process}", $output, $retval);
return (intval($retval) == 0);
}
OpenPOWER on IntegriCloud