summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2006-03-10 23:01:51 +0000
committerScott Ullrich <sullrich@pfsense.org>2006-03-10 23:01:51 +0000
commitb39dc701e59d5b3f2986f98fb3c710b9bc6d36df (patch)
tree16c671b8181212ff163c03b92466c58104a3cd80
parent225ba4a3201bc5d41e70c84e5ec17d97b605ad46 (diff)
downloadpfsense-b39dc701e59d5b3f2986f98fb3c710b9bc6d36df.zip
pfsense-b39dc701e59d5b3f2986f98fb3c710b9bc6d36df.tar.gz
If we cannot find a service executable for an item and we make it to the bottom of stop_service() then simply killall service name
-rw-r--r--etc/inc/service-utils.inc9
1 files changed, 6 insertions, 3 deletions
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc
index 63ed887..ac144f8 100644
--- a/etc/inc/service-utils.inc
+++ b/etc/inc/service-utils.inc
@@ -104,13 +104,16 @@ function stop_service($name) {
if($service['stopcmd']) {
eval($service['stopcmd']);
}
- if(!($service['rcfile'] or $service['stopcmd'])) {
- mwexec_bg("/usr/bin/killall {$service['executable']}");
- }
+ if(!($service['rcfile'] or $service['stopcmd'])) {
+ mwexec_bg("/usr/bin/killall {$service['executable']}");
+ return;
+ }
break;
}
}
}
+ /* finally if we get here lets simply kill the service name */
+ mwexec_bg("/usr/bin/killall {$name}");
}
function restart_service($name) {
OpenPOWER on IntegriCloud