diff options
| author | Colin Smith <colin@pfsense.org> | 2005-06-22 04:25:58 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-06-22 04:25:58 +0000 |
| commit | 58826c73988cb3ae597f8083ad67595836a7b59c (patch) | |
| tree | c3c3bb36587cc2a077b4b1daa3e289b8a27990d2 | |
| parent | a93f79c14f05ecab27b21705af17843224534c63 (diff) | |
| download | pfsense-58826c73988cb3ae597f8083ad67595836a7b59c.zip pfsense-58826c73988cb3ae597f8083ad67595836a7b59c.tar.gz | |
More fixes.
| -rw-r--r-- | etc/inc/service-utils.inc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc index ab2d7ca..258cf8a 100644 --- a/etc/inc/service-utils.inc +++ b/etc/inc/service-utils.inc @@ -59,11 +59,11 @@ function write_rcfile($params) { return; } -function start_service($service) { +function start_service($name) { global $config, $g; if($config['installedpackages']['service']) { foreach($config['installedpackages']['service'] as $service) { - if($service['name'] == $service) { + if($service['name'] == $name) { if($service['rcfile']) { if($service['prefix']) { $prefix =& $service['prefix']; @@ -81,11 +81,11 @@ function start_service($service) { } } -function stop_service($service) { +function stop_service($name) { global $config, $g; if($config['installedpackages']['service']) { foreach($config['installedpackages']['service'] as $service) { - if($service['name'] == $service) { + if($service['name'] == $name) { if($service['rcfile']) { if($service['prefix']) { $prefix =& $service['prefix']; @@ -97,19 +97,22 @@ function stop_service($service) { if($service['stopcmd']) { eval($service['stopcmd']); } + if(!($service['rcfile'] or $service['stopcmd'])) { + mwexec("/usr/bin/killall {$service['executable']}"); + } break; } } } } -function restart_service($service) { +function restart_service($name) { global $config, $g; stop_service($service); start_service($service); if($config['installedpackages']['service']) { foreach($config['installedpackages']['service'] as $service) { - if($service['name'] == $service) { + if($service['name'] == $name) { if($service['restartcmd']) { eval($service['restartcmd']); } |
