From a4d1b14a5e83d9bd2bb9f5757ee30500e69f5594 Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Mon, 10 Jul 2023 16:17:45 +0200
Subject: [PATCH] use overlayfs for /etc

---
 recipes-core/base-files/base-files_%.bbappend       | 4 ++--
 recipes-core/init-ifupdown/files/itf_diya           | 2 +-
 recipes-core/init-ifupdown/init-ifupdown_%.bbappend | 6 ++----
 recipes-diya/diya-overlay/files/80_diya             | 7 +++----
 recipes-diya/diya-overlay/files/confd               | 2 +-
 recipes-kernel/linux/files/{goodix.cfg => diya.cfg} | 1 +
 recipes-kernel/linux/linux-raspberrypi_%.bbappend   | 2 +-
 7 files changed, 11 insertions(+), 13 deletions(-)
 rename recipes-kernel/linux/files/{goodix.cfg => diya.cfg} (58%)

diff --git a/recipes-core/base-files/base-files_%.bbappend b/recipes-core/base-files/base-files_%.bbappend
index 3505b0e..440e315 100644
--- a/recipes-core/base-files/base-files_%.bbappend
+++ b/recipes-core/base-files/base-files_%.bbappend
@@ -1,7 +1,7 @@
 hostname = "diya"
 do_install:append () {
     cat >> ${D}${sysconfdir}/fstab <<EOF
-# add bind mount for /etc
-/etc /var/etc none defaults,bind 0 0
+# add overlay for /etc
+overlay /etc overlay defaults,nofail,lowerdir=/etc,upperdir=/var/etc/upper,workdir=/var/etc/work 0 2
 EOF
 }
\ No newline at end of file
diff --git a/recipes-core/init-ifupdown/files/itf_diya b/recipes-core/init-ifupdown/files/itf_diya
index 118ac83..75f8100 100644
--- a/recipes-core/init-ifupdown/files/itf_diya
+++ b/recipes-core/init-ifupdown/files/itf_diya
@@ -10,7 +10,7 @@ iface wlan0 inet dhcp
 # wireless_mode managed
 # wireless_essid any
 # wpa-driver wext
-wpa-conf /var/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-core/init-ifupdown/init-ifupdown_%.bbappend b/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
index 86f910c..9617860 100644
--- a/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
+++ b/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
@@ -1,9 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI += "file://itf_diya"
+SRC_URI += " file://itf_diya "
 
 do_install:append () {
-    install -d ${D}/var/etc
-    install -d ${D}/var/etc/network
     rm ${D}/etc/network/interfaces
-    install -m 0644 ${WORKDIR}/itf_diya ${D}/var/etc/network/
+    install -m 0644 ${WORKDIR}/itf_diya ${D}/etc/network/interfaces
 }
\ No newline at end of file
diff --git a/recipes-diya/diya-overlay/files/80_diya b/recipes-diya/diya-overlay/files/80_diya
index bf655f4..33fac5f 100644
--- a/recipes-diya/diya-overlay/files/80_diya
+++ b/recipes-diya/diya-overlay/files/80_diya
@@ -1,5 +1,4 @@
-# d root root 0755 /var/etc/dropbear none
-l root root 0644 /etc/network/interfaces /var/etc/network/itf_diya
+d root root 0755 /var/etc/upper none
+d root root 0755 /var/etc/work none
+
 # l root root 0644 /etc/dropbear /var/etc/dropbear
-# l root root 0644 /etc/passwd /var/etc/passwd
-# l root root 0644 /etc/group /var/etc/group
diff --git a/recipes-diya/diya-overlay/files/confd b/recipes-diya/diya-overlay/files/confd
index 5ce1690..1b72ae1 100644
--- a/recipes-diya/diya-overlay/files/confd
+++ b/recipes-diya/diya-overlay/files/confd
@@ -25,7 +25,7 @@ case "$1" in
             rm /boot/home_partition_should_be_formated
         fi
         if [ -e "/boot/wpa_supplicant.conf" ];then
-            mv /boot/wpa_supplicant.conf /var/etc/network/
+            mv /boot/wpa_supplicant.conf /etc/network/
             reboot
         fi
         # display information
diff --git a/recipes-kernel/linux/files/goodix.cfg b/recipes-kernel/linux/files/diya.cfg
similarity index 58%
rename from recipes-kernel/linux/files/goodix.cfg
rename to recipes-kernel/linux/files/diya.cfg
index ad45d68..eddd910 100644
--- a/recipes-kernel/linux/files/goodix.cfg
+++ b/recipes-kernel/linux/files/diya.cfg
@@ -1 +1,2 @@
 CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_OVERLAY_FS=y
diff --git a/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/recipes-kernel/linux/linux-raspberrypi_%.bbappend
index c391fd7..8f2a24c 100644
--- a/recipes-kernel/linux/linux-raspberrypi_%.bbappend
+++ b/recipes-kernel/linux/linux-raspberrypi_%.bbappend
@@ -2,5 +2,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
  
 # inherit kernel
 SRC_URI += " \
-    file://goodix.cfg \
+    file://diya.cfg \
 "
\ No newline at end of file