From 9d8fc99c10f9ee721c1caaa681390dc19857ad9c Mon Sep 17 00:00:00 2001
From: Balaji Punnuru <Balaji_Punnuru@comcast.com>
Date: Wed, 29 Oct 2025 11:59:11 -0400
Subject: [PATCH 1/2] WNCXIONE-530: Fixed changes for migration.

Signed-off-by: Balaji Punnuru <Balaji_Punnuru@comcast.com>
---
 lib/rdk/NM_Bootstrap.sh | 41 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/lib/rdk/NM_Bootstrap.sh b/lib/rdk/NM_Bootstrap.sh
index 1d930133..e1ead41a 100644
--- a/lib/rdk/NM_Bootstrap.sh
+++ b/lib/rdk/NM_Bootstrap.sh
@@ -19,11 +19,13 @@
 # limitations under the License.
 ##############################################################################
 
-WIFI_WPA_SUPPLICANT_CONF="/opt/secure/wifi/wpa_supplicant.conf"
+RDK_PROFILE=$(grep "RDK_PROFILE" /etc/device.properties | cut -d '=' -f 2)
+RDKV_SUPP_CONF="/opt/secure/wifi/wpa_supplicant.conf"
 
-if [ -f $WIFI_WPA_SUPPLICANT_CONF ]; then
-  SSID=$(cat $WIFI_WPA_SUPPLICANT_CONF | grep -w ssid= | cut -d '"' -f 2)
-  PSK_LINE=$(grep psk= "$WIFI_WPA_SUPPLICANT_CONF")
+
+if [ -f $RDKV_SUPP_CONF ]; then
+  SSID=$(cat $RDKV_SUPP_CONF | grep -w ssid= | cut -d '"' -f 2)
+  PSK_LINE=$(grep psk= "$RDKV_SUPP_CONF")
 
   # Case 1: Quoted passphrase
   if [[ "$PSK_LINE" =~ psk=\"(.+)\" ]]; then
@@ -37,6 +39,35 @@ if [ -f $WIFI_WPA_SUPPLICANT_CONF ]; then
   else
     PSK=""
   fi
-  echo "`/bin/timestamp` :$0: Removed nmcli SSID connect" >>  /opt/logs/NMMonitor.log
   sed -i '/network={/,/}/d' /opt/secure/wifi/wpa_supplicant.conf
 fi
+
+if [ -z $SSID ]; then
+      echo "`/bin/timestamp` :$0: No SSID found in supplicant conf" >>  /opt/logs/NMMonitor.log
+      echo "`/bin/timestamp` :$0: Trying with previously configured settings" >>  /opt/logs/NMMonitor.log
+
+      if [ ! -d /opt/secure/NetworkManager/system-connections ]; then
+         mkdir -p /opt/secure/NetworkManager/system-connections
+      fi
+      if [ -d /opt/NetworkManager/system-connections ]; then
+         cp /opt/NetworkManager/system-connections/* /opt/secure/NetworkManager/system-connections/
+         rm -rf /opt/NetworkManager/system-connections/*
+      fi
+      nmcli conn reload
+else
+      if [ -d /opt/NetworkManager/system-connections ]; then
+         rm -rf /opt/NetworkManager/system-connections/*
+      fi
+      if [ "$RDK_PROFILE" == "TV" ]; then
+        echo "`/bin/timestamp` :$0: Migrating Wifi credentials for TVs from NM_Bootsrtap" >>  /opt/logs/NMMonitor.log
+      fi
+      if [ -z $PSK ]; then
+          #connect to wifi
+          nmcli conn add type wifi con-name "$SSID" autoconnect yes ifname wlan0 ssid "$SSID"
+          nmcli conn reload
+      else
+          #connect to wifi
+          nmcli conn add type wifi con-name "$SSID" autoconnect yes ifname wlan0 ssid "$SSID" wifi-sec.key-mgmt wpa-psk wifi-sec.psk "$PSK"
+          nmcli conn reload
+      fi
+fi

From 04f9db5a357f8e9de198bb13417fa6cc72974c78 Mon Sep 17 00:00:00 2001
From: Balaji Punnuru <46974988+bpunnuru@users.noreply.github.com>
Date: Wed, 29 Oct 2025 20:50:47 -0400
Subject: [PATCH 2/2] Create NetworkManager_ecfs.conf (#353)

(cherry picked from commit 70f8618fc616b26a5095e4280cd4e5a65afe0050)

Co-authored-by: Aravindan NC <35158113+AravindanNC@users.noreply.github.com>
(cherry picked from commit 3dd23399adc9a4b62e9d0f9db4a14a9fc7fd2d28)
---
 systemd_units/NetworkManager_ecfs.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 systemd_units/NetworkManager_ecfs.conf

diff --git a/systemd_units/NetworkManager_ecfs.conf b/systemd_units/NetworkManager_ecfs.conf
new file mode 100644
index 00000000..dcf4079f
--- /dev/null
+++ b/systemd_units/NetworkManager_ecfs.conf
@@ -0,0 +1,2 @@
+[Unit]
+After=securemount.service