Skip to content

Tell a Mac without its boot package how to install it - #655

Merged
maralcbr merged 2 commits into
quattro-upstreamfrom
mac/103-missing-boot-package
Sep 28, 2026
Merged

maralcbr merged 2 commits into
quattro-upstreamfrom
mac/103-missing-boot-package

Conversation

@maralcbr

@maralcbr maralcbr commented Sep 28, 2026 •

Copy link
Copy Markdown
Collaborator

A Mac without omarchy-mac-boot stops at every required boot operation (setup-boot, provisioning, reset, update-verify's check) with the dispatcher's exit 3, and its updates only warn that the boot files weren't verified. Nothing installs the package.

Exit 3 means no omarchy-mac-boot record at all, so the Mac runs a fork's or a tester's install, whose repositories and keys must not supply the boot package by plain pacman. A migration can't tell those cohorts apart, so the fix is to refuse with the way out, not auto-install.

  • On Apple Silicon the dispatcher's exit-3 message now ends (to move this machine onto it: sudo omarchy-mac-migrate-bootstrap): the bootstrap fetches the official package, checks its signature and moves the Mac onto it, and defers with a clear reason until the published package activates the migration. Other platforms get no hint.
  • omarchy-update-boot keeps warning; it now says updates verify the boot files "once it is installed", which is also upstream's wording.
  • Docs and tests updated.

Rebased on current quattro-upstream. Upstream (omacom#13362 at df41281) has no bootstrap and keeps the message without a hint; its platform migration still completes as a no-op without the boot package, which is ticket 103's to fix there.

Testing (Arch container, non-root): the 21 test/shell.d files that mention the message or the dispatcher pass, including lifecycle-dispatch-test.sh, update-boot-verify-test.sh, platform-setup-test.sh, factory-reset-*, luks-rekey-journal-test.sh and snapshot-restore-mac-test.sh.

Second review: safe to merge. Its finding, that a plain-pacman hint pointed exactly the cohort this protects at the wrong source, is fixed by the bootstrap hint; a stale doc line is fixed too.

A Mac without omarchy-mac-boot stops at every required boot operation (takeover, setup-boot, provisioning, reset) with exit 3, and its updates only warn that the boot files were not verified. The dispatcher's message now carries the one-line fix for a Mac on Omarchy's repositories, and the update's warning no longer promises a migration that won't install it.
@maralcbr
maralcbr force-pushed the mac/103-missing-boot-package branch from 4d91fee to 0e263bf Compare September 28, 2026 12:53
Exit 3 means no omarchy-mac-boot record at all, which is a fork's or a tester's install; plain pacman there would take the package from the repositories it must not come from. The Apple registration now names omarchy-mac-migrate-bootstrap, which fetches the signed official package and moves the Mac onto it; other platforms get no hint.
@maralcbr
maralcbr merged commit 2b6b797 into quattro-upstream Sep 28, 2026
5 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.

1 participant