From 88905fa58567e33eab9eb0cd032c203d7447bf2e Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Mon, 10 Jul 2023 13:12:50 +0200
Subject: [PATCH] fix partition problem

---
 .../images/core-image-minimal.bbappend        |  1 +
 recipes-core/init-ifupdown/files/itf_diya     | 24 +++++++++++++++++--
 recipes-diya/diya-overlay/files/confd         |  3 +--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/recipes-core/images/core-image-minimal.bbappend b/recipes-core/images/core-image-minimal.bbappend
index a16b389..b088f65 100644
--- a/recipes-core/images/core-image-minimal.bbappend
+++ b/recipes-core/images/core-image-minimal.bbappend
@@ -10,6 +10,7 @@ EXTRA_USERS_PARAMS = "usermod -p BJpK8ADNDLsGg root; \
                         usermod -a -G input diya; \
                         usermod -a -G dialout diya; \
                         usermod -a -G audio diya; \
+                        usermod -a -G avahi diya; \
                         usermod -a -G sudo diya \
                         "
 IMAGE_BOOT_FILES:append = "fs_resize"
diff --git a/recipes-core/init-ifupdown/files/itf_diya b/recipes-core/init-ifupdown/files/itf_diya
index 9a3ded6..3a7a1ae 100644
--- a/recipes-core/init-ifupdown/files/itf_diya
+++ b/recipes-core/init-ifupdown/files/itf_diya
@@ -1,3 +1,23 @@
-allow-hotplug wlan0
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
 iface wlan0 inet dhcp
-    wpa-conf /var/etc/network/wpa_supplicant.conf
\ No newline at end of file
+	wireless_mode managed
+	wireless_essid any
+	wpa-driver wext
+	wpa-conf /var/etc/network/wpa_supplicant.conf
+
+# Ethernet/RNDIS gadget (g_ether)
+# ... or on host side, usbnet and random hwaddr
+iface usb0 inet static
+	address 192.168.7.2
+	netmask 255.255.255.0
+	network 192.168.7.0
+	gateway 192.168.7.1
+
+# Bluetooth networking
+# iface bnep0 inet dhcp
diff --git a/recipes-diya/diya-overlay/files/confd b/recipes-diya/diya-overlay/files/confd
index 2008fd0..5ce1690 100644
--- a/recipes-diya/diya-overlay/files/confd
+++ b/recipes-diya/diya-overlay/files/confd
@@ -25,8 +25,7 @@ case "$1" in
             rm /boot/home_partition_should_be_formated
         fi
         if [ -e "/boot/wpa_supplicant.conf" ];then
-            install -m 0644 /boot/wpa_supplicant.conf /var/etc/network/
-            rm /boot/wpa_supplicant.conf
+            mv /boot/wpa_supplicant.conf /var/etc/network/
             reboot
         fi
         # display information