summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2012-05-07 13:06:12 -0300
committerMarcello Coutinho <marcellocoutinho@gmail.com>2012-05-07 13:06:12 -0300
commit9a1248b3a813ccfad927362e8185879cdba26925 (patch)
treec50e5b57f6873d5e4b6f8ec1ca5ad352c3ea3e39 /etc
parent8d70eb8d9eadf136d211577e763b7f7678ecd489 (diff)
downloadpfsense-9a1248b3a813ccfad927362e8185879cdba26925.zip
pfsense-9a1248b3a813ccfad927362e8185879cdba26925.tar.gz
Stop service needs to wait process to be stopped before trying to restart it.
Diffstat (limited to 'etc')
-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