From 372ad5a2baee8a7101ab0311b43e79fb915fbad9 Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka.garcia@spectrocloud.com>
Date: Wed, 22 Feb 2023 13:35:56 +0100
Subject: [PATCH] Rework writing custom ephemeral/binds

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
---
 overlay/files/system/oem/11_persistency.yaml | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/overlay/files/system/oem/11_persistency.yaml b/overlay/files/system/oem/11_persistency.yaml
index 533dfd412..9623fe991 100644
--- a/overlay/files/system/oem/11_persistency.yaml
+++ b/overlay/files/system/oem/11_persistency.yaml
@@ -37,18 +37,21 @@ stages:
           /var/lib/ca-certificates
         PERSISTENT_STATE_BIND: "true"
     - if: '[ -r /run/cos/custom-layout.env ] && [ ! -f "/run/cos/recovery_mode" ] && [ ! -f /run/cos/live_mode ]'
-      name: "append custom bind and ephemeral mounts to /run/cos/cos-layout.env"
+      name: "add custom bind and ephemeral mounts to /run/cos/cos-layout.env"
       commands:
         - |
-             source /run/cos/cos-layout.env
-             source /run/cos/custom-layout.env
-             PERSISTENT_STATE_PATHS="${CUSTOM_EPHEMERAL_MOUNTS} ${PERSISTENT_STATE_PATHS}"
-             echo CUSTOM_BIND_MOUNTS=\"${CUSTOM_BIND_MOUNTS}\" >> /run/cos/cos-layout.env
-             echo CUSTOM_EPHEMERAL_MOUNTS=\"${CUSTOM_EPHEMERAL_MOUNTS}\" >> /run/cos/cos-layout.env
-             echo "# rw paths with user bind mounts" >> /run/cos/cos-layout.env
-             echo RW_PATHS=\"${RW_PATHS}\" >> /run/cos/cos-layout.env
-             echo "# persistent state paths with user ephemeral mounts" >> /run/cos/cos-layout.env
-             echo PERSISTENT_STATE_PATHS=\"${PERSISTENT_STATE_PATHS}\" >> /run/cos/cos-layout.env
+            source /run/cos/cos-layout.env
+            source /run/cos/custom-layout.env
+            PERSISTENT_STATE_PATHS="${CUSTOM_BIND_MOUNTS} ${PERSISTENT_STATE_PATHS}"
+            RW_PATHS="${CUSTOM_EPHEMERAL_MOUNTS} ${RW_PATHS}"
+            # Remove the existing lines that we are gonna rewrite
+            sed -i "/RW_PATHS/d" /run/cos/cos-layout.env
+            sed -i "/PERSISTENT_STATE_PATHS/d" /run/cos/cos-layout.env
+            # Add the new lines
+            echo "# rw paths with user bind mounts" >> /run/cos/cos-layout.env
+            echo RW_PATHS=\"${RW_PATHS}\" >> /run/cos/cos-layout.env
+            echo "# persistent state paths with user ephemeral mounts" >> /run/cos/cos-layout.env
+            echo PERSISTENT_STATE_PATHS=\"${PERSISTENT_STATE_PATHS}\" >> /run/cos/cos-layout.env
     - if: |
         cat /proc/cmdline | grep -q "kairos.boot_live_mode"
       name: "Layout configuration"