From 3f3c55f1f6e7925f8fe6a60398f2d686d434a1ad Mon Sep 17 00:00:00 2001 From: Anand Date: Wed, 22 Jul 2026 14:13:20 +0000 Subject: [PATCH 1/2] RDKEMW-21821: Order service start after PowerManager Reason for change: Ensure PowerManager service is started before NetworkManager Test procedure: Reboot, then inspect the order units actually started Risks: low Priority: P1 Signed-off-by: Anand N --- plugin/CMakeLists.txt | 2 ++ plugin/NetworkManagerPowerClient.cpp | 3 ++- plugin/gnome/systemd/nm-powermanager.conf | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 plugin/gnome/systemd/nm-powermanager.conf diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt index 32d065dc..588a243d 100644 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -160,6 +160,8 @@ if(ENABLE_GNOME_NETWORKMANAGER) DESTINATION ${CMAKE_INSTALL_PREFIX}/../lib/rdk) install(FILES gnome/systemd/gnome-networkmanager-migration.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/../lib/systemd/system/wpeframework-networkmanager.service.d) + install(FILES gnome/systemd/nm-powermanager.conf + DESTINATION ${CMAKE_INSTALL_PREFIX}/../lib/systemd/system/wpeframework-networkmanager.service.d) endif(ENABLE_GNOME_NETWORKMANAGER) #Generate Plugin configuration file diff --git a/plugin/NetworkManagerPowerClient.cpp b/plugin/NetworkManagerPowerClient.cpp index 3d6d2ed9..94a8694b 100644 --- a/plugin/NetworkManagerPowerClient.cpp +++ b/plugin/NetworkManagerPowerClient.cpp @@ -34,12 +34,13 @@ NetworkManagerPowerClient::NetworkManagerPowerClient(INetworkPowerCallback& call , mPreChangeNotification(*this) , mChangedNotification(*this) { - NMLOG_INFO("connecting to PowerManager"); + NMLOG_INFO("NetworkManagerPowerClient ctor"); if (auto r = Open(RPC::CommunicationTimeOut, Connector(), "org.rdk.PowerManager"); r == Core::ERROR_NONE) { // Connected; Operational() will be called by the framework when the proxy is ready } else { NMLOG_ERROR("failed to open link to PowerManager (error %u)", r); } + NMLOG_INFO("NetworkManagerPowerClient ctor ends"); } NetworkManagerPowerClient::~NetworkManagerPowerClient() diff --git a/plugin/gnome/systemd/nm-powermanager.conf b/plugin/gnome/systemd/nm-powermanager.conf new file mode 100644 index 00000000..556d362c --- /dev/null +++ b/plugin/gnome/systemd/nm-powermanager.conf @@ -0,0 +1,3 @@ +[Unit] +# Ensure NetworkManager starts after PowerManager +After=wpeframework-powermanager.service From 8ff0012238520382b0947659ee5576e5a2d1d32a Mon Sep 17 00:00:00 2001 From: Karunakaran A <48997923+karuna2git@users.noreply.github.com> Date: Fri, 31 Jul 2026 14:46:00 -0400 Subject: [PATCH 2/2] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- plugin/gnome/systemd/nm-powermanager.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/plugin/gnome/systemd/nm-powermanager.conf b/plugin/gnome/systemd/nm-powermanager.conf index 556d362c..7e8c3f01 100644 --- a/plugin/gnome/systemd/nm-powermanager.conf +++ b/plugin/gnome/systemd/nm-powermanager.conf @@ -1,3 +1,4 @@ [Unit] # Ensure NetworkManager starts after PowerManager +Wants=wpeframework-powermanager.service After=wpeframework-powermanager.service