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

---
 recipes-core/base-files/base-files_%.bbappend       | 2 +-
 recipes-core/init-ifupdown/init-ifupdown_%.bbappend | 2 --
 recipes-diya/diya-overlay/diya-overlay.bb           | 4 ++++
 recipes-diya/diya-overlay/files/80_diya             | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/recipes-core/base-files/base-files_%.bbappend b/recipes-core/base-files/base-files_%.bbappend
index 7ce0967..440e315 100644
--- a/recipes-core/base-files/base-files_%.bbappend
+++ b/recipes-core/base-files/base-files_%.bbappend
@@ -2,6 +2,6 @@ hostname = "diya"
 do_install:append () {
     cat >> ${D}${sysconfdir}/fstab <<EOF
 # add overlay for /etc
-overlay /test overlay defaults,nofail,lowerdir=/etc,upperdir=/var/etc/upper,workdir=/var/etc/work 0 2
+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/init-ifupdown_%.bbappend b/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
index 4237d59..9617860 100644
--- a/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
+++ b/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
@@ -3,7 +3,5 @@ SRC_URI += " file://itf_diya "
 
 do_install:append () {
     rm ${D}/etc/network/interfaces
-    install -d ${D}/test/
-    install -m 0644 ${WORKDIR}/itf_diya ${D}/test/interfaces
     install -m 0644 ${WORKDIR}/itf_diya ${D}/etc/network/interfaces
 }
\ No newline at end of file
diff --git a/recipes-diya/diya-overlay/diya-overlay.bb b/recipes-diya/diya-overlay/diya-overlay.bb
index a0940ed..f5cf6f9 100644
--- a/recipes-diya/diya-overlay/diya-overlay.bb
+++ b/recipes-diya/diya-overlay/diya-overlay.bb
@@ -27,4 +27,8 @@ do_install() {
 	install -m 0644 ${WORKDIR}/80_diya ${D}${sysconfdir}/default/volatiles
     install -m 0755 ${WORKDIR}/expandfs.sh ${D}/usr/bin/expandfs.sh
     install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
+
+    install -d ${D}/var/etc
+    install -d ${D}/var/etc/upper
+    install -d ${D}/var/etc/work
 }
diff --git a/recipes-diya/diya-overlay/files/80_diya b/recipes-diya/diya-overlay/files/80_diya
index 33fac5f..fe9404b 100644
--- a/recipes-diya/diya-overlay/files/80_diya
+++ b/recipes-diya/diya-overlay/files/80_diya
@@ -1,4 +1,4 @@
-d root root 0755 /var/etc/upper none
-d root root 0755 /var/etc/work none
+#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