summaryrefslogtreecommitdiffstats
path: root/etc/inc/service-utils.inc
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2012-05-07 12:53:15 -0300
committerMarcello Coutinho <marcellocoutinho@gmail.com>2012-05-07 12:53:15 -0300
commit6ae78f0808747893f30b867c51b744dfe39e2190 (patch)
treebc1619cde2e7feb1a279e3d0e2ed270f2c701e5f /etc/inc/service-utils.inc
parent89341b505e8956b358b4c20aa59727e73b0ad567 (diff)
downloadpfsense-6ae78f0808747893f30b867c51b744dfe39e2190.zip
pfsense-6ae78f0808747893f30b867c51b744dfe39e2190.tar.gz
Stop service needs to wait process to be stopped before trying to restart/start it.
Diffstat (limited to 'etc/inc/service-utils.inc')
-rw-r--r--etc/inc/service-utils.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc
index 57b1719..01230a1 100644
--- a/etc/inc/service-utils.inc
+++ b/etc/inc/service-utils.inc
@@ -129,7 +129,7 @@ function stop_service($name) {
$prefix =& $service['prefix'];
}
if(file_exists("{$prefix}{$service['rcfile']}")) {
- mwexec_bg("{$prefix}{$service['rcfile']} stop");
+ mwexec("{$prefix}{$service['rcfile']} stop");
}
return;
}
@@ -138,7 +138,7 @@ function stop_service($name) {
if(!($service['rcfile'] or $service['stopcmd'])) {
if(is_process_running("{$service['executable']}"))
- mwexec_bg("/usr/bin/killall {$service['executable']}");
+ mwexec("/usr/bin/killall {$service['executable']}");
return;
}
break;
@@ -147,7 +147,7 @@ function stop_service($name) {
}
/* finally if we get here lets simply kill the service name */
if(is_process_running("{$name}"))
- mwexec_bg("/usr/bin/killall {$name}");
+ mwexec("/usr/bin/killall {$name}");
}
function restart_service($name) {
OpenPOWER on IntegriCloud