Repository navigation
Run the Mac's boot setup through the platform setup seam - #635
Merged
Merged
Conversation
Hardware setup's last leaf now runs the platform boot package's setup-boot before the runtime package's setup-system, so the GRUB console and Limine activation leave the shared hardware leaves. setup-boot is required on Apple: a boot package without it stops the leaf instead of skipping the activation. The runtime's shims stay for the image builder and for queues of images built before.
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.
Ticket 103 open item "the boot shims". Hardware setup's last leaf (
install/hardware/platform-setup.sh) now runs a new dispatch operation,setup-boot [image-first-boot], implemented by omarchy-mac-boot, before omarchy-mac'ssetup-system.install/hardware/all.shno longer runs theapple/grub-console.shandapple/limine-boot.shshims.setup-bootis required on Apple: a boot package without it stops the hardware leaf and asks for the update, where optional would silently skip the Limine activation (today a missing boot package fails the shim too). So omarchy-mac-boot must publish with or before this runtime (held boot re-pin Pin omarchy-mac-boot to the engine that repairs converted Macs (20260927-2) omarchy-pkgs#673 will carry it once re-pinned past this).packages/omarchy-mac/boot/entrypoints/setup-boot) sourcessetup/grub-console.shthensetup/limine-boot.shas root under a cleared environment withOMARCHY_PATH=/usr/share/omarchy; withimage-first-bootthe Limine leaf asks for the deferred rebuild (/var/lib/omarchy/image/boot-rebuild) as before.setup/limine-boot.shdirectly.Upstream (omacom#13362) gets the generic part (the operation and the leaf) in a follow-up batch; written into ticket 103.
Tests: new
boot/test/mac-setup-boot-test.sh;platform-setup-test.sh(order, argument, either failing, boot package without the entrypoint),lifecycle-dispatch-test.sh(setup-boot among required operations). Boot suite 287/287; runtime suite only the usual environment failures.Debated in two rounds (made required on Apple; test fixed). Second review: no blockers; docs and fixture nits fixed.