From b25ea1c4b85c1821b54fbaef8fbe7ea8da705d14 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 7 Nov 2023 16:13:40 +0100 Subject: [PATCH] Kea / Dhcp - DHCPv4 replacement, missing service validation for https://github.com/opnsense/core/issues/6971 --- src/etc/inc/plugins.inc.d/kea.inc | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/kea.inc b/src/etc/inc/plugins.inc.d/kea.inc index 349f15100..34b502b66 100644 --- a/src/etc/inc/plugins.inc.d/kea.inc +++ b/src/etc/inc/plugins.inc.d/kea.inc @@ -28,16 +28,20 @@ function kea_services() { - $services[] = [ - 'description' => gettext('KEA DHCPv4 server'), - 'pidfile' => '/var/run/kea/kea-dhcp4.kea-dhcp4.pid', - 'configd' => [ - 'restart' => ['kea restart'], - 'start' => ['kea start'], - 'stop' => ['kea stop'], - ], - 'name' => 'kea-dhcpv4', - ]; + + $services = []; + if (!empty((string)(new \OPNsense\Kea\KeaDhcpv4())->general->enabled)) { + $services[] = [ + 'description' => gettext('KEA DHCPv4 server'), + 'pidfile' => '/var/run/kea/kea-dhcp4.kea-dhcp4.pid', + 'configd' => [ + 'restart' => ['kea restart'], + 'start' => ['kea start'], + 'stop' => ['kea stop'], + ], + 'name' => 'kea-dhcpv4', + ]; + } return $services; }