From 6f2daad53321d2df20f4de44b507ad4d828bb276 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 20 Feb 2016 12:54:44 +0100 Subject: [PATCH] serivce: need another type for command launcher --- src/etc/inc/services.inc | 3 +++ src/www/status_services.php | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index d3043d0f6..f17081338 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -2702,6 +2702,9 @@ function services_get() $services[] = array( 'description' => gettext('System Configuration Daemon'), 'pidfile' => '/var/run/configd.pid', + 'mwexec' => array( + 'start' => array('/usr/local/etc/rc.d/configd start'), + ), 'name' => 'configd', ); diff --git a/src/www/status_services.php b/src/www/status_services.php index c2f6f5925..8a721b712 100644 --- a/src/www/status_services.php +++ b/src/www/status_services.php @@ -102,9 +102,15 @@ function service_control_start($name, $extras) } /* XXX fall through later */ return sprintf(gettext('%s has been started via php.'), htmlspecialchars($name)); + } elseif (isset($service['mwexec']['start'])) { + foreach ($service['mwexec']['start'] as $cmd) { + mwexec($cmd); + } + /* XXX fall through later */ + return sprintf(gettext('%s has been started via mwexec.'), htmlspecialchars($name)); } - /* XXX migrate all of those */ + /* XXX migrate all of those */ switch ($service['name']) { case 'radvd': services_radvd_configure(); @@ -149,9 +155,6 @@ function service_control_start($name, $extras) case 'suricata': configd_run("ids start"); break; - case 'configd': - mwexec('/usr/local/etc/rc.d/configd start'); - break; case 'captiveportal': configd_run("captiveportal start"); break;