Skip to content

Leave overlays out of the boot check when update-m1n1's configuration does - #10

Merged
maralcbr merged 2 commits into
mainfrom
fix/dtb-overlays-follow-config
Oct 4, 2026
Merged

maralcbr merged 2 commits into
mainfrom
fix/dtb-overlays-follow-config

Conversation

@scottjones

@scottjones scottjones commented Oct 4, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

Two follow-ups to #3. The boot check now leaves device tree overlays out when /etc/default/update-m1n1 doesn't apply them, so it stops failing a boot.bin that update-m1n1 built correctly and blocking omarchy 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 needs sudo 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 overlays

The 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 a boot.bin built without the overlays.

Merge Danger

Door: two-way

Blast Radius: edge Macs with overlays

This can happen now. omarchy-mac-boot 20261004-2 (built from #3) and omarchy-ane-dkms 0.4.5 are 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-m1n1 before upgrading, installing it makes the boot check fail a correct boot.bin and stop omarchy 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.bin by update-m1n1, boot check passing, clean reboot.

🤖 Generated with Claude Code

scottjones and others added 2 commits October 4, 2026 15:37
… 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>
@scottjones
scottjones requested a review from maralcbr as a code owner October 4, 2026 19:45
@scottjones

scottjones commented Oct 4, 2026 •

Copy link
Copy Markdown
Collaborator Author

@maralcbr this got more urgent overnight: omarchy-mac-boot 20261004-2 and omarchy-ane-dkms 0.4.5 are both on edge now, so the first real overlays have shipped. On a Mac whose owner edited /etc/default/update-m1n1 before the upgrade, pacman keeps their copy without the overlay call, and installing the ANE package makes the boot check fail a correct boot.bin and stop omarchy update. I've updated the Merge Danger section above to match. Worth merging and re-pinning omarchy-mac-boot soon if it looks right to you.

@maralcbr
maralcbr merged commit 7dff2ac into main Oct 4, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants