Repository navigation
Conversation
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>
The fork's omarchy-mac-setup points GRUB_FONT at a HiDPI font it writes to
the ESP's grub/fonts. Once the boot switch moves the ESP to /boot/efi, that
path is gone, and setup-boot's update-grub fails in grub-mkconfig ("failed to
get canonical path of /boot/grub/fonts/unicode32.pf2"), so the Limine
activation is undone. Remove an unreachable GRUB_FONT from GRUB's defaults
while moving the ESP, keeping the original for the undo.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kernel_release returned the first module tree whose pkgbase named the kernel. aurora-sep installs its kernel outside pacman, so its tree stays after the transaction, says linux-aurora and sorts before the packaged one: the legacy stage copied that old kernel to the root's /boot and the staged boot check refused it. With several trees naming the kernel, take the one whose vmlinuz the package installs. Found migrating a j414s with aurora-sep's 7.1.12 kernel to 7.2.11. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
[Medium impact] The reviewed commit appears safe to merge. SummaryReviewed commit
Reviews (1) · Last reviewed commit: "Take the Aurora release from the tree th..." · Reviewed by Greptile |
This branch has not been deployed
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
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.
For #690. Stacked on #727 (and so #726): this branch contains their commits, so review only the last commit (c51704d). I'll rebase it onto
mac/migrate-standaloneonce those are merged.Found on real hardware. MacBook Pro 14" M2 Pro (j414s), encrypted legacy cohort (quattro guided install, LUKS + btrfs + snapper, GRUB, ESP at
/boot), with Touch ID through aurora-sep (install-aurora-sep.sh).loaderfailed:kernel_release()returns the first/usr/lib/modules/*/whosepkgbasenames the kernel. aurora-sep installs its kernel outside pacman:/usr/lib/modules/7.1.12-2-20261013.18-sep-ARCH/is owned by no package, so the transaction leaves it, itspkgbasesayslinux-aurora, and it sorts before7.2.11-10-1-ARCH.legacy_build_initramfsthen copied the old sepvmlinuzto the root's/boot/vmlinuz-linux-auroraand the UKI was built from it. The final boot check caught it before the reboot, so nothing unbootable became the default. The same can happen with any leftover tree carrying the pkgbase (a hand-built kernel, a running kernel whose package was replaced).Change: when one tree names the kernel, nothing changes. When several do,
kernel_release()takes the one whosevmlinuzthe package itself installs (pacman -Qlq), asomarchy-apple-silicon-boot-checkdoes, and fails if none matches.Tests: a new
encrypted-sepcase inmac-migrate-legacy-test.shadds an unowned tree withpkgbaselinux-aurorathat sorts before the packaged one. It fails without the change (the root's/bootgets "sep kernel 7.1.11") and passes with it. Results:mac-migrate-legacy-test26/26 (with the Plymouth path hidden, as in #727),mac-migrate-test49/49,mac-migrate-mx-test28/28,mac-move-migration-test4/4,migrate/build --checkclean.Real-Mac result: with that tree's
pkgbasemoved aside by hand (which is what this change does in code),runresumed atloaderand finished; after the rebootverifypassed ("This Mac now runs repository https://pkgs.omarchy.org/edge/$arch"), bootinglinux-aurora 7.2.11-10-1-ARCHthrough Limine.The rest of aurora-sep (its pin blocking preflight, its leftovers) is in #778.
🤖 Generated with Claude Code