From eb3c308b5d1fc52aed02182612a49c3d4ceafc39 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Fri, 22 Mar 2024 13:11:06 +0100 Subject: [PATCH] Run reset on uki autoreset (#762) --- packages/static/kairos-overlay-files/collection.yaml | 2 +- .../files/system/oem/00_rootfs_uki.yaml | 8 ++++---- .../kairos-overlay-files/files/system/oem/51_reset.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml index a55fbb8..1e0ef54 100644 --- a/packages/static/kairos-overlay-files/collection.yaml +++ b/packages/static/kairos-overlay-files/collection.yaml @@ -1,4 +1,4 @@ packages: - name: "kairos-overlay-files" category: "static" - version: "1.1.31" + version: "1.1.32" diff --git a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml index a19502b..d96a9d3 100644 --- a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml +++ b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml @@ -8,7 +8,7 @@ name: "Rootfs Layout Settings for UKI" stages: rootfs: - - if: '[ -e "/run/cos/uki_boot_mode" ] && [ ! -e "/run/cos/recovery_mode" ]' + - if: '[ -e "/run/cos/uki_boot_mode" ] && [ ! -e "/run/cos/recovery_mode" ] && [ ! -e "/run/cos/autoreset_mode" ]' name: "Layout configuration for UKI boot" environment_file: /run/cos/cos-layout.env environment: @@ -46,9 +46,9 @@ stages: /var/lib/wicked /var/log /var/snap - - if: '[ -e "/run/cos/uki_boot_mode" ] && [ -e "/run/cos/recovery_mode" ]' - # omit the persistent partition on recovery mode - name: "Layout configuration for recovery mode on UKI" + - if: '[ -e "/run/cos/uki_boot_mode" ] && ([ -e "/run/cos/recovery_mode" ] || [ -e "/run/cos/autoreset_mode" ])' + # omit the persistent partition on recovery mode/autoreset + name: "Layout configuration for recovery/autoreset mode on UKI" environment_file: /run/cos/cos-layout.env environment: OVERLAY: "tmpfs:25%" diff --git a/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml b/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml index a0db97a..286c4b6 100644 --- a/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml +++ b/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml @@ -3,7 +3,7 @@ stages: initramfs: - name: "Starts kairos-reset for systemd based systems" if: | - grep -q "kairos.reset" /proc/cmdline && \ + (grep -q "kairos.reset" /proc/cmdline || [ -f /run/cos/autoreset_mode ]) && \ ( [ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] ) commands: - systemctl disable getty@tty1