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.

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

Try both Clevis and passphrase in /etc/fstab setup #3528

Merged
merged 1 commit into from
Jan 11, 2024

Conversation

jbaublitz
Copy link
Member

Closes #3349

@jbaublitz jbaublitz self-assigned this Jan 4, 2024
@jbaublitz jbaublitz force-pushed the issue-stratisd-3349 branch 2 times, most recently from 14e6469 to bd0a8cc Compare January 8, 2024 20:57
@jbaublitz
Copy link
Member Author

@mvollmer I tested this patch and it resolves the linked issue. The one question I had was mainly about whether you had this problem at boot time too. I think we may take a similar approach but I'm not sure.

@jbaublitz
Copy link
Member Author

@mulkieran I'm putting this in review after testing and bug fixes.

Copy link
Collaborator

@mvollmer mvollmer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this works, but the code was a bit hard to follow.

systemd/stratis-fstab-setup Outdated Show resolved Hide resolved
systemd/stratis-fstab-setup Outdated Show resolved Hide resolved
@jbaublitz jbaublitz force-pushed the issue-stratisd-3349 branch from bd0a8cc to 02c269b Compare January 9, 2024 15:38
@jbaublitz jbaublitz requested a review from mvollmer January 9, 2024 15:41
@jbaublitz
Copy link
Member Author

@mvollmer I've re-requested your review. I think I've resolved the issues you mentioned.

@jbaublitz jbaublitz force-pushed the issue-stratisd-3349 branch from 02c269b to 492a89e Compare January 9, 2024 15:42
@jbaublitz
Copy link
Member Author

@mvollmer After investigating a little bit more, I can confirm that the same problem affects the initrd scripts, but it's a little bit harder to solve there largely because we have intentionally separated the Clevis unlock method and the passphrase unlock method into separate dracut modules. This is largely because Anaconda does not support Clevis but does support the keyring unlock method for cryptsetup. These are distributed in separate packages as a result so Anaconda could theoretically support one without the other. I'll have to look into whether there's a way to set a flag based on whether executables are present or not in a dracut module. If we did that, we could potentially merge both dracut modules into a single, dynamic one that would also satisfy the requirement for Anaconda.

@mulkieran
Copy link
Member

@mvollmer We're ready to merge as soon as you're satisfied w/ the changes.

Copy link
Collaborator

@mvollmer mvollmer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@mulkieran mulkieran merged commit 917ac9c into stratis-storage:master Jan 11, 2024
37 of 40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pools with NBDE can never be unlocked with a passphrase during boot
3 participants