Take into account uki mode for rootfs stuff

Signed-off-by: Itxaka <[email protected]>
kairos-io · Mar 13, 2023 · afb263e · afb263e
1 parent e320462
commit afb263e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 42 deletions.
diff --git a/overlay/files/system/oem/00_rootfs.yaml b/overlay/files/system/oem/00_rootfs.yaml
@@ -13,7 +13,7 @@ stages:
         providers: ["aws", "gcp", "openstack", "cdrom"]
         path: "/oem"
   rootfs:
-    - if: '[ ! -f "/run/cos/recovery_mode" ]'
+    - if: '[ ! -f "/run/cos/recovery_mode" ] &&  [ ! -e "/run/cos/uki_mode" ]'
       name: "Layout configuration"
       environment_file: /run/cos/cos-layout.env
       environment:

diff --git a/overlay/files/system/oem/10_accounting.yaml b/overlay/files/system/oem/10_accounting.yaml
@@ -16,8 +16,8 @@ stages:
           homedir: "/home/kairos"
           groups:
             - "admin"
-    - name: "Set user password if running in live"
-      if: "[ -e /run/cos/live_mode ]"
+    - name: "Set user password if running in live or uki"
+      if: "[ -e /run/cos/live_mode ] || [ -e /run/cos/uki_mode ]"
       users:
         kairos:
           passwd: "kairos"

diff --git a/overlay/files/system/oem/11_persistency.yaml b/overlay/files/system/oem/11_persistency.yaml
@@ -39,7 +39,7 @@ stages:
           /usr/share/pki/trust
           /usr/share/pki/trust/anchors
           /var/lib/ca-certificates
-    - if: '([ -e "/run/cos/active_mode" ] || [ -e "/run/cos/passive_mode" ]) && [ ! -e "/run/cos/uki_mode" ]'
+    - if: '[ ! -f "/run/cos/recovery_mode" ] &&  [ ! -e "/run/cos/uki_mode" ]'
       name: "Layout configuration for active/passive"
       environment_file: /run/cos/cos-layout.env
       environment:

diff --git a/overlay/files/system/oem/32_uki.yaml b/overlay/files/system/oem/32_uki.yaml