rancher/packages
1
0
Fork 0
mirror of https://github.com/kairos-io/packages.git synced 2025-07-31 15:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent normal recovery layout under uki (#651)

Browse Source
This commit is contained in:
Itxaka 2024-02-02 11:20:41 +01:00 committed by GitHub
parent ad5b54f6f3
commit aa4bc5d20f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/static/kairos-overlay-files/collection.yaml
View File

@ -1,4 +1,4 @@
packages: packages:
- name: "kairos-overlay-files" - name: "kairos-overlay-files"
category: "static" category: "static"
version: "1.1.25" version: "1.1.26"

2
packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml
View File

@ -48,7 +48,7 @@ stages:
/var/log /var/log
/var/snap /var/snap
PERSISTENT_STATE_BIND: "true" PERSISTENT_STATE_BIND: "true"
- if: '[ -f "/run/cos/recovery_mode" ]' - if: '[ -f "/run/cos/recovery_mode" ] && grep -vq "rd.immucore.uki" /proc/cmdline'
# omit the persistent partition on recovery mode # omit the persistent partition on recovery mode
name: "Layout configuration for recovery mode" name: "Layout configuration for recovery mode"
environment_file: /run/cos/cos-layout.env environment_file: /run/cos/cos-layout.env

4
packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml
View File

@ -8,7 +8,7 @@
name: "Rootfs Layout Settings for UKI" name: "Rootfs Layout Settings for UKI"
stages: stages:
rootfs: rootfs:
- if: '[ -e "/run/cos/uki_boot_mode" ] && [ ! -f "/run/cos/recovery_mode" ]' - if: '[ -e "/run/cos/uki_boot_mode" ] && [ ! -e "/run/cos/recovery_mode" ]'
name: "Layout configuration for UKI boot" name: "Layout configuration for UKI boot"
environment_file: /run/cos/cos-layout.env environment_file: /run/cos/cos-layout.env
environment: environment:
@ -46,7 +46,7 @@ stages:
/var/lib/wicked /var/lib/wicked
/var/log /var/log
/var/snap /var/snap
- if: '[ -e "/run/cos/uki_boot_mode" ] && [ -f "/run/cos/recovery_mode" ]' - if: '[ -e "/run/cos/uki_boot_mode" ] && [ -e "/run/cos/recovery_mode" ]'
# omit the persistent partition on recovery mode # omit the persistent partition on recovery mode
name: "Layout configuration for recovery mode on UKI" name: "Layout configuration for recovery mode on UKI"
environment_file: /run/cos/cos-layout.env environment_file: /run/cos/cos-layout.env