Skip to content

Accept aarch64-apple as the Mac platform in omarchy-mac-migrate - #726

Open
patrikduksin wants to merge 1 commit into
omacom:mac/migrate-standalonefrom
patrikduksin:mac/migrate-platform-rename
Open

patrikduksin wants to merge 1 commit into
omacom:mac/migrate-standalonefrom
patrikduksin:mac/migrate-platform-rename

Conversation

@patrikduksin

Copy link
Copy Markdown

For #690.

omacom#14431 renamed the detector's Apple Silicon platform from apple-silicon to aarch64-apple. run and verify still compared hardware_platform with apple-silicon (engine.sh, migrate_run and migrate_verify).

The first run is unaffected, because a fork runtime has no omarchy-hw-platform and the device-tree fallback says apple-silicon. Once the migration completes, past_boundary is false and the migrated runtime's detector says aarch64-apple. The boot unit then returns without retrying pending user setup, and a rerun of run reports "Not an Apple Silicon Mac". This adds apple_platform, which accepts both names, and uses it in both places.

Tests: the user-pending test now switches the fixture platform to aarch64-apple before the boot that retries, as on a migrated Mac. It fails without the change and passes with it. mac-migrate-test (49), mac-migrate-mx-test (28) and mac-move-migration-test (4) pass, and migrate/build --check is clean. bin/omarchy-mac-migrate and the README checksum are rebuilt. In mac-migrate-legacy-test, "the root's /boot gets the converged systemd image" fails on this machine both with and without this change, so it is environment-dependent and not caused by this fix. shellcheck was not available locally.

Related, not in this PR: upstream migration 1791581004 fails on Apple Silicon (omacom#15223, fix in omacom#15279). A Mac migrated today keeps hitting it on every omarchy update until that fix lands, because it is not among the migrations settled_migrations marks.

🤖 Generated with Claude Code

omacom/omarchy omacom#14431 renamed the detector's Apple Silicon platform to
aarch64-apple. A migrated Mac runs that detector, so a boot that retries
pending user setup after the migration completed read the Mac as another
platform and returned without retrying. Accept both names.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@patrikduksin

Copy link
Copy Markdown
Author

@maralcbr

This branch has not been deployed

No deployments
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