From ca90b5e60f2db3a74f97f6b38fb98daf8df330f6 Mon Sep 17 00:00:00 2001 From: Anand Date: Thu, 23 Jul 2026 05:15:38 +0000 Subject: [PATCH] RDKEMW-22160: 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 77dc8237..fd204059 100644 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -161,6 +161,8 @@ if(ENABLE_GNOME_NETWORKMANAGER) install(FILES gnome/systemd/gnome-networkmanager-mfrmgr-migration.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/../lib/systemd/system/wpeframework-networkmanager.service.d) endif(ENABLE_MIGRATION_MFRMGR_SUPPORT) + 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