Repository navigation
Installer: write the encryption choice onto the new ESP, not an empty folder - #15
Merged
Merged
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
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.
Port of Eryk Wieliczko's fix from maralcbr/omarchy-mx-mac#274 (issue maralcbr/omarchy-mx-mac#273, still open there). Commit author kept.
The engine leaves the new ESP mounted in /Volumes.
diskutil mount -mountPoint <dir>then succeeds without moving it, so install.conf, which carries the encryption choice, went into an empty directory instead of the ESP. First boot then defaulted to encrypting, even with the checkbox off. Now the ESP is unmounted and mounted again at the handoff directory. The write only goes ahead whendiskutil infoconfirms that exact device is writable there. The failure cleanup usesrmdirso it can never recurse into a mounted filesystem.Tested on the M4:
swift-format lint --strictclean;swift testdebug (463) and release (457) pass, including the five new mount tests;test/allpasses. The contributor tested it on a MacBook Air M1 with encryption off. Not yet run on our test Macs.Second review: no verified findings. Checked unmount/remount safety, the mount-point verification and the cleanup path.