From 7e6f63800d173402063de0e32bb1c1a6ac2d3c5e Mon Sep 17 00:00:00 2001
From: jincysam87 <167995204+jincysam87@users.noreply.github.com>
Date: Mon, 11 May 2026 21:09:32 -0400
Subject: [PATCH 1/3] Update NM_Bootstrap.sh

---
 lib/rdk/NM_Bootstrap.sh | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/lib/rdk/NM_Bootstrap.sh b/lib/rdk/NM_Bootstrap.sh
index 237283f6..e5ca1957 100644
--- a/lib/rdk/NM_Bootstrap.sh
+++ b/lib/rdk/NM_Bootstrap.sh
@@ -57,20 +57,6 @@ if [ -f $RDKV_SUPP_CONF ]; then
   else
     PSK=""
   fi
-
-  #########################
-  # Key_Mgmt Extraction   #
-  #########################
-  KEY_MGMT_LINE=$(grep -m 1 '^[[:space:]]*key_mgmt=' "$RDKV_SUPP_CONF")                  
-  # Extract value after '=' and remove quotes                                            
-  KEY_MGMT_VALUE=$(printf '%s\n' "$KEY_MGMT_LINE" | sed 's/.*key_mgmt=//; s/"//g')       
-                                                                                         
-  if [ "$KEY_MGMT_VALUE" = "SAE" ] || [ "$KEY_MGMT_VALUE" = "SAE FT-SAE" ]; then
-      KEY_MGMT=sae                                                                
-  else                                        
-      KEY_MGMT=wpa-psk                                                       
-  fi 
-  echo "`/bin/timestamp`: key_mgmt is $KEY_MGMT" >> /opt/logs/NMMonitor.log   
     
   sed -i '/network={/,/}/d' "$RDKV_SUPP_CONF"
 fi
@@ -127,7 +113,7 @@ else
           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 "$KEY_MGMT"  wifi-sec.psk "$PSK"
+          nmcli conn add type wifi con-name "$SSID" autoconnect yes ifname wlan0 ssid "$SSID" wifi-sec.psk "$PSK"
           nmcli conn reload
       fi
 fi

From 3b49797f06091aaa549e060f556086efd4bff5c3 Mon Sep 17 00:00:00 2001
From: jincysam87 <167995204+jincysam87@users.noreply.github.com>
Date: Tue, 12 May 2026 11:41:14 -0400
Subject: [PATCH 2/3] Update NM_Bootstrap.sh

---
 lib/rdk/NM_Bootstrap.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/rdk/NM_Bootstrap.sh b/lib/rdk/NM_Bootstrap.sh
index e5ca1957..08ea45b5 100644
--- a/lib/rdk/NM_Bootstrap.sh
+++ b/lib/rdk/NM_Bootstrap.sh
@@ -109,11 +109,9 @@ else
       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
+          nmcli device wifi connect ssid "$SSID"
       else
           #connect to wifi
-          nmcli conn add type wifi con-name "$SSID" autoconnect yes ifname wlan0 ssid "$SSID" wifi-sec.psk "$PSK"
-          nmcli conn reload
+          nmcli device wifi connect ssid "$SSID" password "$PSK"
       fi
 fi

From 9d73c4eeb820c148b733b43421b53250916f1412 Mon Sep 17 00:00:00 2001
From: jincysam87 <167995204+jincysam87@users.noreply.github.com>
Date: Tue, 12 May 2026 12:08:31 -0400
Subject: [PATCH 3/3] Update NM_Bootstrap.sh

---
 lib/rdk/NM_Bootstrap.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rdk/NM_Bootstrap.sh b/lib/rdk/NM_Bootstrap.sh
index 08ea45b5..b734fff2 100644
--- a/lib/rdk/NM_Bootstrap.sh
+++ b/lib/rdk/NM_Bootstrap.sh
@@ -109,9 +109,9 @@ else
       fi
       if [ -z "$PSK" ]; then
           #connect to wifi
-          nmcli device wifi connect ssid "$SSID"
+          nmcli device wifi connect "$SSID"
       else
           #connect to wifi
-          nmcli device wifi connect ssid "$SSID" password "$PSK"
+          nmcli device wifi connect "$SSID" password "$PSK"
       fi
 fi