Repository navigation
Leave overlays out of the boot check when update-m1n1's configuration does - #10
Merged
Merged
Conversation
… does /etc/default/update-m1n1 is in the recipe's backup array, so an owner who edited it before the overlays shipped keeps their copy and gets the new one as a .pacnew. Their update-m1n1 never calls dtb_overlays_update_m1n1 and builds boot.bin without the overlays, but the boot check applied them whenever an overlay was installed, failed that boot.bin and stopped omarchy update. The same happened with no configuration file at all. The check now applies the overlays only when the configuration calls dtb_overlays_update_m1n1, and otherwise warns, pointing at the .pacnew. It looks for the call in the file instead of watching it run, because the configuration sources the library from an absolute path, which a check of another root cannot follow. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Nothing watches /etc/omarchy-mac-boot/dtb-overlays.opt-in, so an owner who opts in or out keeps the old boot.bin, while the boot check reads the list as it is now and reports boot.bin as stale. Its failure already says to run sudo update-m1n1; the README now says so up front. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Collaborator
Author
|
@maralcbr this got more urgent overnight: |
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.
Summary
Two follow-ups to #3. The boot check now leaves device tree overlays out when
/etc/default/update-m1n1doesn't apply them, so it stops failing aboot.binthatupdate-m1n1built correctly and blockingomarchy update. That happens with an owner's edited copy that pacman kept over the.pacnew, or with no config file at all. The README also says that changing the opt-in list needssudo update-m1n1.overlays installed? + config never calls dtb_overlays_update_m1n1 → warn (merge the .pacnew), leave them out DTBS set in the config → warn, leave them out update-m1n1 default not recognised → warn, leave them out dtc missing or too old → warn, leave them out else → rebuild with the overlaysThe check looks for the call in the file instead of running it, because the config loads the overlay library from an absolute path, which a check of another root can't follow.
Evidence
omarchy-mac-boot/test/apple-silicon-boot-check-test.sh, new cases: an edited config without the call, and no config, each with aboot.binbuilt without the overlays.not ok - an m1n1 image built without the overlays, with the configuration edited passesboot.binas stale.omarchy-mac-boot/test/allpasses on an M2 Max (with the snapshot-test fix from Hide the platform detector without hiding /usr/bin in the snapshot check test #9 in place).Merge Danger
Door: two-way
Blast Radius: edge Macs with overlays
This can happen now.
omarchy-mac-boot 20261004-2(built from #3) andomarchy-ane-dkms 0.4.5are on edge, and the ANE package ships overlays in/usr/lib/omarchy-mac-boot/dtb-overlays. On a Mac whose owner edited/etc/default/update-m1n1before upgrading, installing it makes the boot check fail a correctboot.binand stopomarchy update. The ANE overlays for T6000 and T6020 are opt-in, which is where the README note matters. The change itself only relaxes the check for a config that doesn't apply overlays; with the packaged config, nothing changes.Still worth one end-to-end run on hardware with the ANE package: overlay built into
boot.binbyupdate-m1n1, boot check passing, clean reboot.🤖 Generated with Claude Code