Refine deferred disk encryption and passphrase handling#1726
Merged
brianmcgillion merged 2 commits intotiiuae:mainfrom Feb 11, 2026
Merged
Refine deferred disk encryption and passphrase handling#1726brianmcgillion merged 2 commits intotiiuae:mainfrom
brianmcgillion merged 2 commits intotiiuae:mainfrom
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
1cc204b to
3f3f1bc
Compare
3f3f1bc to
1f2fe7f
Compare
mbssrc
reviewed
Feb 10, 2026
mbssrc
approved these changes
Feb 10, 2026
1f2fe7f to
5c71d5b
Compare
This commit introduces several refinements to the deferred disk encryption process, focusing on robustness, passphrase handling and control over LUKS slot management. In debug image, the default passphrase for encryption has been standardized to "ghaf", addressing limitations with empty passphrases in `systemd-cryptenroll`. User can enroll with either TPM2 or FIDO2 and the Yubikey can be utilized for both disk encryption and user account management. Signed-off-by: Vunny Sodhi <vunny.sodhi@unikie.com>
List of changes: - Use systemd-ask-password for passphrase prompting - Retry LUKS resize until successful - Run post-boot script via boot.postBootCommands - Update extendbtrfs service dependencies - Fix screen text wrapping issue. Signed-off-by: Vunny Sodhi <vunny.sodhi@unikie.com>
5c71d5b to
14130f4
Compare
brianmcgillion
approved these changes
Feb 11, 2026
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
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.
Description of Changes
This commit introduces several refinements to the deferred disk encryption process, focusing on robustness, passphrase handling and control over LUKS slot management.
In debug image, the default passphrase for encryption has been standardized to "ghaf", addressing limitations with empty passphrases in
systemd-cryptenroll.Fixed resize issue with
release-installerwhen disk encryption is used.User can enroll with either TPM2 or FIDO2 and the Yubikey can be utilized for both disk encryption and user account management.
Below table shows key enrolment difference:
[ghaf@ghaf-host:~]$ sudo systemd-cryptenroll /dev/nvme0n1p3SLOT TYPE0 password1 tpm22 recovery[ghaf@ghaf-host:~]$ sudo systemd-cryptenroll /dev/nvme0n1p3SLOT TYPE0 passwordBy default
tpm2will be enabled.Type of Change
Related Issues / Tickets
Checklist
make-checksand it passesTesting Instructions
Applicable Targets
aarch64aarch64x86_64x86_64x86_64Installation Method
nixos-rebuild ... switchTest Steps To Verify:
PR functionality is available with installer only, when used with
-eoption.User can change to
fido2by modifyingdefault = "fido2"in disk-encryption using that Yubikey can be used both to disk encryption and user account management.When using

fido2, user need toconfirm presenceby tapping on the Yubikey once encryption is complete, as illustrated below.Test
tpm2andfido2functionality with debug and release images when disk encryption is used.