Fix accounting and layout in uki mode (#454)

This commit is contained in:
Itxaka
2023-09-25 17:47:04 +02:00
committed by GitHub
parent bb7a8bc57d
commit 11862509a5
4 changed files with 5 additions and 5 deletions

View File

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

View File

@@ -12,7 +12,7 @@ stages:
if: '[ ! -e "/sbin/systemctl" ] && [ ! -e "/usr/bin/systemctl" ] && [ ! -e "/usr/sbin/systemctl" ] && [ ! -e "/usr/bin/systemctl" ]'
commands:
- mount bpffs -o rw,nosuid,nodev,noexec,relatime,mode=700 /sys/fs/bpf -t bpf
- if: '[ ! -f "/run/cos/recovery_mode" ] && [ ! -e "/run/cos/uki_mode" ]'
- if: '[ ! -f "/run/cos/recovery_mode" ] && [ ! -e "/run/cos/uki_boot_mode" ] || [ ! -e "/run/cos/uki_install_mode" ]'
name: "Layout configuration for active/passive mode"
environment_file: /run/cos/cos-layout.env
environment:

View File

@@ -8,7 +8,7 @@
name: "Rootfs Layout Settings for UKI"
stages:
rootfs:
- if: '[ -e "/run/cos/uki_mode" ] && [ ! -e "/run/cos/uki_boot_mode" ]'
- if: '[ -e "/run/cos/uki_boot_mode" ]'
name: "Layout configuration for UKI boot"
environment_file: /run/cos/cos-layout.env
environment:
@@ -46,7 +46,7 @@ stages:
/usr/share/pki/trust
/usr/share/pki/trust/anchors
/var/lib/ca-certificates
- if: '[ -e "/run/cos/uki_mode" ] && [ -e "/run/cos/uki_install_mode" ]'
- if: '[ -e "/run/cos/uki_install_mode" ]'
# omit everything on installer, just set the ephemeral paths
name: "Layout configuration for UKI installer"
environment_file: /run/cos/cos-layout.env

View File

@@ -17,7 +17,7 @@ stages:
groups:
- "admin"
- name: "Set user password if running in live or uki"
if: "[ -e /run/cos/live_mode ] || [ -e /run/cos/uki_mode ]"
if: "[ -e /run/cos/live_mode ] || [ -e /run/cos/uki_install_mode ] || [ -e /run/cos/uki_boot_mode ]"
users:
kairos:
passwd: "kairos"