From 7b75b29500fc551cd5a996e4d32c446ca26bb2cd Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Thu, 27 Mar 2025 11:57:29 +0100
Subject: [PATCH] rename config.txt file to diya-config.txt to avoid conflict
 wuth rpi

---
 recipes-core/images/base-image.inc               | 2 +-
 recipes-diya/diya-overlay/diya-overlay.bb        | 2 +-
 recipes-diya/diya-overlay/files/boot-to-recovery | 8 ++++----
 recipes-diya/initramfs/files/confd               | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/recipes-core/images/base-image.inc b/recipes-core/images/base-image.inc
index 9252d13..ab5ce3c 100644
--- a/recipes-core/images/base-image.inc
+++ b/recipes-core/images/base-image.inc
@@ -8,7 +8,7 @@ EXTRA_USERS_PARAMS =    "usermod -d /home/diya -p 2Pe/4xyFxsokE diya; \
                         usermod -a -G audio diya; \
                         usermod -a -G sudo diya; \
                         "
-IMAGE_BOOT_FILES:append = " fs_resize config.txt recovery-${MACHINE}.cpio.gz Image "
+IMAGE_BOOT_FILES:append = " fs_resize diya-config.txt recovery-${MACHINE}.cpio.gz Image "
 
 IMAGE_INSTALL:append = "kernel-modules \
                         e2fsprogs \
diff --git a/recipes-diya/diya-overlay/diya-overlay.bb b/recipes-diya/diya-overlay/diya-overlay.bb
index eeba401..75fd38b 100644
--- a/recipes-diya/diya-overlay/diya-overlay.bb
+++ b/recipes-diya/diya-overlay/diya-overlay.bb
@@ -31,7 +31,7 @@ do_install() {
     install -m 0755 ${WORKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
     install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
 
-    cat << EOF > ${DEPLOY_DIR_IMAGE}/config.txt
+    cat << EOF > ${DEPLOY_DIR_IMAGE}/diya-config.txt
 recovery=false
 recovery_image=recovery-${MACHINE}.cpio.gz
 console=both
diff --git a/recipes-diya/diya-overlay/files/boot-to-recovery b/recipes-diya/diya-overlay/files/boot-to-recovery
index 2f6f9b1..3caa5ba 100755
--- a/recipes-diya/diya-overlay/files/boot-to-recovery
+++ b/recipes-diya/diya-overlay/files/boot-to-recovery
@@ -7,15 +7,15 @@ fi
 
 . /etc/profile
 
-if [ ! -e /boot/config.txt ]; then
+if [ ! -e /boot/diya-config.txt ]; then
     # prepare env for recovery boot
-    cat << EOF > /boot/config.txt
+    cat << EOF > /boot/diya-config.txt
 recovery=true
 recovery_image=recovery-${MACHINE}.cpio.gz
 EOF
 else
-    sed -i 's/^.*recovery.*/recovery=true/g' /boot/config.txt || \
-                echo "recovery=true" >> /boot/config.txt
+    sed -i 's/^.*recovery.*/recovery=true/g' /boot/diya-config.txt || \
+                echo "recovery=true" >> /boot/diya-config.txt
 fi
 echo "Rebooting to recovery mode"
 reboot
\ No newline at end of file
diff --git a/recipes-diya/initramfs/files/confd b/recipes-diya/initramfs/files/confd
index ac65de7..010d362 100644
--- a/recipes-diya/initramfs/files/confd
+++ b/recipes-diya/initramfs/files/confd
@@ -7,8 +7,8 @@ DESC="Custom configuration"
 case "$1" in
     start)
         echo -n "Start $DESC: "
-        sed -i 's/^.*recovery.*/recovery=false/g' /boot/config.txt || \
-                echo "recovery=false" >> /boot/config.txt
+        sed -i 's/^.*recovery.*/recovery=false/g' /boot/diya-config.txt || \
+                echo "recovery=false" >> /boot/diya-config.txt
     ;;
 
     *)