Draft
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces logic to detect if the system is running on ostree and updates the crypttab generation to include the 'x-initrd.attach' option when necessary. I have identified an issue where the ostree marker file is incorrectly being checked within the target sysroot instead of the host's runtime directory. Additionally, I have suggested updating the detection logic to support an environment variable override for better testability and recommended updating the test case to verify the full crypttab output.
prestist
force-pushed
the
worktree-fix-luks-soft-reboot
branch
from
b7c58a7 to
7d58038
Compare
Add tests verifying x-initrd.attach option is added to crypttab entries on ostree systems. This prevents systemd-cryptsetup-generator from tearing down LUKS devices during soft-reboot. Related: coreos#2216
On ostree systems, soft-reboot fails with LUKS because systemd tears down the crypto device during shutdown. Unlike traditional systems where the kernel root mount prevents this, ostree's /sysroot is a regular mount. Add x-initrd.attach to crypttab entries on ostree systems (detected via /run/ostree-booted or OSTREE_BOOTED=1 env var). This tells systemd- cryptsetup-generator to skip adding Conflicts=umount.target, preventing device teardown. Non-ostree systems are unchanged. Fixes: coreos#2216
prestist
force-pushed
the
worktree-fix-luks-soft-reboot
branch
from
7d58038 to
774a042
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.