From 8045fc257d2d9144f822b6cfc8a65c38f25604c6 Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Mon, 21 Jul 2025 19:45:59 +0200
Subject: [PATCH] switch to NetworkManager instead of wpasupplicant

---
 recipes-core/images/base-image.inc           | 3 ++-
 recipes-core/images/core-image-base.bbappend | 1 +
 recipes-core/init-ifupdown/files/itf_diya    | 6 +++---
 recipes-diya/diya-overlay/files/confd        | 9 +++------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/recipes-core/images/base-image.inc b/recipes-core/images/base-image.inc
index a87b4ae..3d280d9 100644
--- a/recipes-core/images/base-image.inc
+++ b/recipes-core/images/base-image.inc
@@ -33,7 +33,8 @@ IMAGE_INSTALL:append = "kernel-modules \
                         i2c-tools \
                         bash \
                         nano \
-                        wpa-supplicant \
+                        iwd \
+                        networkmanager networkmanager-nmcli networkmanager-bluetooth dhcpcd \
                         evtest \
                         rsync \
                         coreutils \
diff --git a/recipes-core/images/core-image-base.bbappend b/recipes-core/images/core-image-base.bbappend
index e22bc3c..1e0eb13 100644
--- a/recipes-core/images/core-image-base.bbappend
+++ b/recipes-core/images/core-image-base.bbappend
@@ -16,6 +16,7 @@ IMAGE_INSTALL:append = "pango \
                         pixman \
                         cairo \
                         glib-2.0 \
+                        glibmm \
                         freetype \
                         fontconfig \
                         librsvg librsvg-gtk \
diff --git a/recipes-core/init-ifupdown/files/itf_diya b/recipes-core/init-ifupdown/files/itf_diya
index 75f8100..e51474a 100644
--- a/recipes-core/init-ifupdown/files/itf_diya
+++ b/recipes-core/init-ifupdown/files/itf_diya
@@ -5,12 +5,12 @@ auto lo
 iface lo inet loopback
 
 # Wireless interfaces
-auto wlan0
-iface wlan0 inet dhcp
+#auto wlan0
+#iface wlan0 inet dhcp
 # wireless_mode managed
 # wireless_essid any
 # wpa-driver wext
-wpa-conf /etc/network/wpa_supplicant.conf
+#wpa-conf /etc/network/wpa_supplicant.conf
 
 # Ethernet/RNDIS gadget (g_ether)
 # ... or on host side, usbnet and random hwaddr
diff --git a/recipes-diya/diya-overlay/files/confd b/recipes-diya/diya-overlay/files/confd
index df99950..8d9e40c 100644
--- a/recipes-diya/diya-overlay/files/confd
+++ b/recipes-diya/diya-overlay/files/confd
@@ -34,13 +34,10 @@ case "$1" in
             mkdir -p /home/diya
             chown -R diya:diya /home/diya
         fi
-        if [ -e "/boot/wpa_supplicant.conf" ];then
-            mv /boot/wpa_supplicant.conf /etc/network/
-            reboot
+        if ls /boot/*.nmconnection > /dev/null 2>&1 ;then
+            mv /boot/*.nmconnection /etc/NetworkManager/system-connections/
+            chmod 600 /etc/NetworkManager/system-connections/*.nmconnection
         fi
-        # display information
-        # disable wifi power save
-        # /usr/sbin/iw wlan0 set power_save off
     ;;
     *)
         N=/etc/init.d/$NAME