Repository navigation
Give a Mac's disk one password, with no recovery key - #657
Merged
Merged
Conversation
Owner setup no longer adds, shows or arms a disk recovery key: the re-key keeps the owner's slot alone and records it with an empty recovery=. The Mac boot check accepts that owner-only disk, and still a Mac set up before with an owner and a recovery slot recorded. That recovery slot stays as a plain second passphrase: nothing removes it, and omarchy-drive-recover, its units and the migration that armed them go, with a migration that disarms the units.
This was referenced Sep 28, 2026
Closed
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.
Owner decision (2026-09-28): drop the disk recovery key and match upstream's single-password default (omacom#2005). Counterpart of the upstream runtime change on omacom#13362.
omarchy-mac-boot): accepts an owner-only disk (one keyslot,owner_slotrecorded) and still a Mac set up before with owner and recovery slots recorded; the header must hold exactly the recorded slots.luks-slotsalready treated an emptyrecovery=as none and a missing one as keep.omarchy-drive-recoverarming; the re-key keeps the owner's slot and runsluks-slots owner=<slot> recovery=. In-place encryption and the owner password unlocking the disk are unchanged. An older runtime's interrupted setup journal (any phase, includingdone) finishes with the owner's slot alone.omarchy-drive-recover, its units,luks-recovery.shand the arming migration go; a new migration removes armed units (sudo only when present).omarchy-drive-passwordstill refuses a recovery-key-form password, but only on a disk with more than one slot.recovery-resetremoved) follow.Release order: the
omarchy-mac-bootfrom this commit must publish with or before any runtime that drops the key; an older boot check fails an owner-only disk after setup. Noted on omacom/omarchy-pkgs#673.Tested in an Arch container:
packages/omarchy-mac/boot/test/allpasses (new owner-only and two-slot boot-check fixtures, owner-onlyluks-slots);test/shellhas the same 15 environment failures as the base commit and nothing else (rewritten provision-owner and re-key journal tests, older-journal phases, legacy drive-password guard, retirement migration). Not run on hardware (demo freeze). Design debate and a second review: fixed thedone-phase journal and stale docs; accepted that a resumed older setup takes the old recovery key if the owner types it as the password.Not here: the installer's encryption help still promises a recovery key (
PlainLanguage.encryptLinuxDiskRecoveryin omacom/omarchy-mac-installer).