From 2dec1793c06088ebeb761b8c91c7af4d65603f6f Mon Sep 17 00:00:00 2001
From: aadhithan01 <64963550+aadhithan01@users.noreply.github.com>
Date: Thu, 19 Feb 2026 11:58:28 +0000
Subject: [PATCH 1/2] dnsmasq is not running when enabling DHCPMANAGER

---
 source/pmon/pmon.c                                  | 4 +---
 source/scripts/init/c_registration/15_dhcp_server.c | 4 ----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/source/pmon/pmon.c b/source/pmon/pmon.c
index 85cbe84c..4a33efae 100644
--- a/source/pmon/pmon.c
+++ b/source/pmon/pmon.c
@@ -178,13 +178,11 @@ static int proc_mon (const char *proc_name, const char *pid_file, const char *cm
         return 0;
     }
     v_secure_system("echo ' RDKB_PROCESS_CRASHED : %s is not running, need restart ' >> /rdklogs/logs/SelfHeal.txt.0 ",proc_name);
-    //dnsmasq selfheal mechanism is in Aggresive Selfheal for DHCP Manager
-    #if !defined (FEATURE_RDKB_DHCP_MANAGER)
 
     if(!strcmp(proc_name,"dnsmasq")) {
         t2_event_d("SYS_SH_dnsmasq_restart",1);
     }
-    #endif
+
     printf("pmon: attempting to restart '%s' using '%s'\n", proc_name, cmd);
     if (pid_file) {
         printf("pmon: removing pid file %s\n", pid_file);
diff --git a/source/scripts/init/c_registration/15_dhcp_server.c b/source/scripts/init/c_registration/15_dhcp_server.c
index 2aee6edd..bd0a9146 100644
--- a/source/scripts/init/c_registration/15_dhcp_server.c
+++ b/source/scripts/init/c_registration/15_dhcp_server.c
@@ -85,11 +85,7 @@ const char* SERVICE_CUSTOM_EVENTS[] = {
 
 void srv_register(void) {
    sm_register(SERVICE_NAME, SERVICE_DEFAULT_HANDLER, SERVICE_CUSTOM_EVENTS);
-
-   //dnsmasq selfheal mechanism is in Aggresive Selfheal for DHCP Manager
-   #if !defined (FEATURE_RDKB_DHCP_MANAGER)
    v_secure_system("/etc/utopia/service.d/pmon.sh register dhcp_server");   
-   #endif
 }
 
 #ifdef RDKB_EXTENDER_ENABLED

From dfc602728dca28a3bfba904aaff332a45bed44be Mon Sep 17 00:00:00 2001
From: aadhithan01 <64963550+aadhithan01@users.noreply.github.com>
Date: Fri, 20 Feb 2026 05:09:23 +0000
Subject: [PATCH 2/2] Update 15_dhcp_server.c

---
 source/scripts/init/c_registration/15_dhcp_server.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/scripts/init/c_registration/15_dhcp_server.c b/source/scripts/init/c_registration/15_dhcp_server.c
index bd0a9146..0b1751a8 100644
--- a/source/scripts/init/c_registration/15_dhcp_server.c
+++ b/source/scripts/init/c_registration/15_dhcp_server.c
@@ -149,10 +149,7 @@ void stop_service()
 
 void srv_unregister(void) {
 
-   //dnsmasq selfheal mechanism is in Aggresive Selfheal for DHCP Manager
-   #if !defined (FEATURE_RDKB_DHCP_MANAGER)
    v_secure_system("/etc/utopia/service.d/pmon.sh unregister dhcp_server");
-   #endif
 
    #ifdef RDKB_EXTENDER_ENABLED
    stop_service();