diff options
| author | Scott Ullrich <sullrich@gmail.com> | 2012-05-07 10:27:49 -0700 |
|---|---|---|
| committer | Scott Ullrich <sullrich@gmail.com> | 2012-05-07 10:27:49 -0700 |
| commit | 9a1a0facc09141a5e6f24aa3fd6e5fd353f87682 (patch) | |
| tree | bc1619cde2e7feb1a279e3d0e2ed270f2c701e5f | |
| parent | 89341b505e8956b358b4c20aa59727e73b0ad567 (diff) | |
| parent | 6ae78f0808747893f30b867c51b744dfe39e2190 (diff) | |
| download | pfsense-9a1a0facc09141a5e6f24aa3fd6e5fd353f87682.zip pfsense-9a1a0facc09141a5e6f24aa3fd6e5fd353f87682.tar.gz | |
Merge pull request #100 from marcelloc/patch-7
Stop service needs to wait process to be stopped before trying to restar...
| -rw-r--r-- | etc/inc/service-utils.inc | 6 |
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) { |
