From 6c301f2e9864440414384794b607f6701965201f Mon Sep 17 00:00:00 2001 From: David Cassany Date: Wed, 8 May 2024 17:19:30 +0200 Subject: [PATCH] Move mount config file to /run/elemental Signed-off-by: David Cassany --- .../embedded/cloud-config-defaults/system/oem/00_layout.yaml | 4 ++-- .../etc/systemd/system/elemental-rootfs.service | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/features/embedded/cloud-config-defaults/system/oem/00_layout.yaml b/pkg/features/embedded/cloud-config-defaults/system/oem/00_layout.yaml index 27f90531279..213ea9ebf87 100644 --- a/pkg/features/embedded/cloud-config-defaults/system/oem/00_layout.yaml +++ b/pkg/features/embedded/cloud-config-defaults/system/oem/00_layout.yaml @@ -11,9 +11,9 @@ stages: - if: '[ ! -f "/run/elemental/recovery_mode" ]' name: "Layout configuration" files: - - path: /etc/elemental/config.d/layout.yaml + - path: /run/elemental/config.d/layout.yaml content: | mount: ephemeral: type: tmpfs - size: 25% \ No newline at end of file + size: 25% diff --git a/pkg/features/embedded/elemental-rootfs/etc/systemd/system/elemental-rootfs.service b/pkg/features/embedded/elemental-rootfs/etc/systemd/system/elemental-rootfs.service index 7f9d85dd49c..3af848a5f02 100644 --- a/pkg/features/embedded/elemental-rootfs/etc/systemd/system/elemental-rootfs.service +++ b/pkg/features/embedded/elemental-rootfs/etc/systemd/system/elemental-rootfs.service @@ -13,7 +13,7 @@ Type=oneshot RemainAfterExit=yes EnvironmentFile=-/run/cos/cos-layout.env EnvironmentFile=-/run/elemental/mount-layout.env -ExecStart=/usr/bin/elemental mount --debug +ExecStart=/usr/bin/elemental --config-dir /run/elemental mount --debug [Install] WantedBy=initrd-fs.target