diff --git a/src/etc/inc/plugins.inc.d/kea.inc b/src/etc/inc/plugins.inc.d/kea.inc index a64113d44..c403d0eac 100644 --- a/src/etc/inc/plugins.inc.d/kea.inc +++ b/src/etc/inc/plugins.inc.d/kea.inc @@ -115,7 +115,10 @@ function kea_configure_do($verbose = false) $keaDhcpv4 = new \OPNsense\Kea\KeaDhcpv4(); if ($keaDhcpv4->isEnabled()) { service_log('Sync KEA DHCP config...', $verbose); - $keaDhcpv4->generateConfig(); + if ($keaDhcpv4->general->manual_config->isEmpty()) { + /* skip kea-dhcp4.conf when configured manually */ + $keaDhcpv4->generateConfig(); + } (new \OPNsense\Kea\KeaCtrlAgent())->generateConfig(); service_log("done.\n", $verbose); } diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/generalSettings4.xml b/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/generalSettings4.xml index 182df08c3..ae929167c 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/generalSettings4.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/generalSettings4.xml @@ -1,7 +1,7 @@