Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Run reset on uki autoreset #762

Merged
merged 2 commits into from
Mar 22, 2024
Merged

Run reset on uki autoreset #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0843a2f
Run reset on uki autoreset
Itxaka Mar 22, 2024
bae3bb8
Also fix the rootfs on autoreset
Itxaka Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/static/kairos-overlay-files/collection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packages:
- name: "kairos-overlay-files"
category: "static"
version: "1.1.31"
version: "1.1.32"
8 changes: 4 additions & 4 deletions packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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%"
Expand Down
2 changes: 1 addition & 1 deletion packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading