Skip the encrypt hook on verified plain roots - #9686
Open
Skeptomenos wants to merge 1 commit into
Open
Conversation
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.
Omarchy always includes mkinitcpio's classic
encrypthook. On a direct unencrypted root with nocryptdevice=, the hook tries to treatroot=as an encrypted mapping and prints an early boot error. The system can still boot, but the message indicates a configuration that does not match the storage layout.This change keeps the complete current hook list as the safe default. It removes only
encryptwhenfindmntandlsblkprove that root is a direct ext4 or Btrfs filesystem backed only by a partition or disk. Encrypted, LVM, RAID, unsupported and unknown layouts keepencrypt. Explicit classic-encrypt selectors, activecrypttab.initramfsrows and all discovery failures also keep it.The migration evaluates the installed hook configuration without privilege. It rebuilds affected existing images with
limine-mkinitcpio, ormkinitcpio -Pwhen Limine is absent. It records completion only after a successful rebuild, so failures remain retryable across users.Validation:
part → diskand omits onlyencrypt.Related to #6876. This PR handles the verified direct plain-root case and leaves the broader storage-hook redesign to that issue.