Repository navigation
Keep an administrator's migration target as it is in the Mac bootstrap - #607
Merged
Merged
Conversation
An existing /etc/omarchy-mac/migration-target now reaches the engine unchanged (server=, packages= and all) instead of being replaced by the packaged target or rewritten without server=. A --channel that disagrees with it is ignored with a warning. An explicit --channel is kept even when it matches the package's own, and a refetched package is checked again.
maralcbr
added a commit
to maralcbr/omarchy-mx-mac
that referenced
this pull request
Sep 27, 2026
Same change as omacom#607: an existing /etc/omarchy-mac/migration-target reaches the engine unchanged (server=, packages= and all), a --channel that disagrees with it is ignored with a warning, an explicit --channel is kept even when it matches the package's own, and a refetched package is checked again.
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
1 participant
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.
Ticket 53 follow-up to #602.
omarchy-mac-migrate-bootstraplet an existing/etc/omarchy-mac/migration-targetoverride--channel, then either rewrote the file withoutserver=(when its channel differed from the packaged target's) or passed the packaged target instead (when equal). A Mac withchannel=rcand a custom mirror migrated to public rc, and an explicit--channel edgesilently stayed rc.Now:
server=,packages=,keyring=and all). A target without a stable/rc/edge channel defers (75).--channelthat disagrees with it is ignored with a warning naming both channels and the file. Deferring instead would strand the mx-mac prime migration, which passes--channeland gates the later conversion on its success.--channelis now kept even when it matches the package's own, and a package refetched from the channel the stable target names is checked again (activation,--payload, repository channel) before its target is used.The package still downloads from pkgs.omarchy.org's channel; a mirror in
server=governs the engine's transaction only (fetching the payload from a mirror is left for a separate change).Tests:
test/shell.d/mac-migrate-bootstrap-test.shgains cases for a custom server/packages target passed unchanged (packaged channel equal and different), channel kept, a conflicting--channelon run and prime, an unknown channel, an explicit--channelequal to the package's, and a refetched package that names another channel or does not activate; the existing no-target case still gets the packaged target. 15/15 pass on Arch; the new cases fail on the old script. Approach debated over two rounds; second review: no verified findings, two wording nits fixed.Follow-up: mx-mac #276 vendors this script and needs the same change synced.