Skip to content

Fresh installs and images never add the unsigned [omarchy-aarch64] - #563

Merged
maralcbr merged 1 commit into
quattro-upstreamfrom
mac/71b-no-unsigned-aarch64-repo
Sep 26, 2026
Merged

maralcbr merged 1 commit into
quattro-upstreamfrom
mac/71b-no-unsigned-aarch64-repo

Conversation

@maralcbr

Copy link
Copy Markdown
Member

Ticket 71 follow-up (gap ledger R1). On the converged M2 Max, image 2's deferred step install/hardware/apple/pacman.sh appended [omarchy-aarch64] with SigLevel = Optional TrustAll to /etc/pacman.conf. Nothing was installed from it; the stanza was removed by hand.

What changed

  • install/hardware/all.sh no longer lists apple/pacman.sh, so fresh hardware setup and an image's deferred queue never run it.
  • The leaf returns at once on an image-built Mac (/var/lib/omarchy/image/target or target.booted). That covers a queue an older image deferred when the runtime is updated before it finishes, and migration 1788200000 if a user's migration markers are missing (failed finalize, second user). Macs installed before images have neither file, so legacy behaviour is unchanged.
  • Comments that assumed the leaf (all.sh, the leaf header, the omarchy-mac-boot hardware drop-in) now say it is legacy only.

Signed sources

Checked against the live aarch64 databases: every package the Apple leaves and the composed Apple set pull comes signed from [omarchy] edge, asahi-alarm or Arch Linux ARM: avd-fw, libva-v4l2_request-avd, widevine, hyprland-preview-share-picker, vulkan-asahi, asahi-bless, the speaker stack, and the user-run cursor-bin, 1password, 1password-cli, voxtype-bin. The Apple package resolution fixture already forbids [omarchy-aarch64] and passes. Only in [omarchy-aarch64]: obsidian-appimage (its Apple user leaf tries the repos, then the AUR, with warnings only), obs-studio (base list; resolution and the image builder already record it as unpublished), and packages only menu installers or legacy migrations name: brave-origin-bin, hermes-desktop, grok-bot, ghostty*, hypa-ttfx-bin, omarchy-webapp-theme, dotnet-*-2.1. These are the O5 gap in the ledger. No hardware leaf needs them, so nothing fails.

Migration 1788200000 and ticket 44

A fresh install marks every shipped migration done (omarchy-provision-user --first-install, from owner provisioning), so omarchy update never runs it there; the new test checks that. The migration is untouched for legacy installs. Ticket 44 (and the migration engine's tester transition) removes [omarchy-aarch64] from those; after that the migration stays marked done and does not re-add it.

Tests

  • test/shell.d/apple-pacman-repo-test.sh: the leaf is not in hardware setup. At the seam, every hardware leaf that touches pacman's configuration runs on a stubbed Mac and leaves pacman.conf with no [omarchy-aarch64] and no TrustAll. An image-built Mac, before and after first boot, gets no repository from the leaf or the migration. The legacy leaf and migration cases still pass. Putting the leaf back in all.sh, or removing the guard, fails the test.
  • test/shell.d/provision-user-test.sh: a first install marks every migration done, 1788200000 included.
  • Arch container as CI runs it, non-root: ./test/all 334/336 files pass; the 2 failures are in .github/known-test-failures. The omarchy-mac boot suite passes; its snapshot-check-test.sh failed once in two suite runs and passed 6 of 6 in isolation (flaky, from Check Mac snapshot restores against the boot files outside the snapshot #560; not touched here).

Second review: no defect in the diff. Residuals, out of scope: a factory reset of an image-2 Mac restores that image's old runtime and queue, so only a rebuilt image clears it. omarchy-upgrade-to-quattro still writes [omarchy] with Optional TrustAll (user-invoked, ticket 44).

Installer side: omacom/omarchy-mac-installer#12 fails an image whose pacman.conf has TrustAll or whose queue names this leaf.

Image 2's first boot ran install/hardware/apple/pacman.sh, which appended
[omarchy-aarch64] with SigLevel = Optional TrustAll to a converged Mac's
pacman.conf. Every package the Apple leaves and lists pull now comes signed
from [omarchy], asahi-alarm and Arch Linux ARM, so hardware setup no longer
lists the leaf, and it returns at once on an image-built Mac (a queue an
older image deferred, or the migration). Legacy installs keep migration
1788200000 as it was.
@maralcbr
maralcbr merged commit dc4ad95 into quattro-upstream Sep 26, 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