Repository navigation
Drop the fork's GRUB_FONT once the ESP leaves /boot - #727
patrikduksin wants to merge 2 commits into
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>
|
Reproduced on a second machine: MacBook Air (M1, 2020), j313, the same encrypted legacy cohort as yours (GRUB, busybox I ran
Instead of switching builds, I applied this PR's change by hand (commented out Post-migration drift worth knowing about (not this PR): the fork set touchpad |
For #690. Stacked on #726: this branch contains #726's commit, so review only the last commit (30a20d6). Rebase it onto
mac/migrate-standaloneonce #726 is merged.Found on real hardware. A MacBook Pro 14" M1 Pro (j314s), encrypted legacy cohort (GRUB, busybox
encrypt, ESP at/boot), installed with quattro's guided installer. As far as I know, this is the first run of #690 on a real Mac.The fork's
bin/omarchy-mac-setup(quattro, around line 580) writes a HiDPI font to/boot/grub/fonts/unicode32.pf2on the ESP and setsGRUB_FONT=to that path in/etc/default/grub.legacy_move_espmoves the ESP to/boot/efiand creates an empty/boot/grubon the root, so the font path disappears.setup-boot'slimine-boot.shstill runs Asahi'supdate-grubwhen GRUB's tools are installed, andgrub-mkconfigstops:The rollback worked as designed, and GRUB kept booting the Mac. Nothing short of this fix lets the migration get past
loader, and it is likely to hit every Mac set up byomarchy-mac-setup.Change: after moving the ESP,
legacy_move_espchecksGRUB_FONT. If it names a file that is no longer reachable, the line is dropped from GRUB's defaults, and the original is kept throughlegacy_stage_keep, solegacy_unstagerestores it. GRUB is retired after the switch anyway.Tests:
update-grubaslimine-boot.shdoes.update-grubstub now fails, asgrub-mkconfigdoes, whenGRUB_FONTnames a missing file.boot.loggains that call.encrypted-fontcase uses the fork's font on the ESP. It fails without the change, and passes with it.mac-migrate-legacy-test25/25,mac-migrate-test49/49,mac-migrate-mx-test28/28,mac-move-migration-test4/4, andmigrate/build --checkis clean.On the "converged systemd image" failure I mentioned in #726: it depends on the environment. The fixture's
93-omarchy-mac-plymouth.confchecks the host's/usr/lib/initcpio/install/plymouth, so the test fails on any machine with Plymouth installed. With that path hidden (bwrap --dev-bind / / --tmpfs /usr/lib/initcpio/install), it passes.Real-Mac result with this fix: resumed at
loader→loader done, and Limine took U-Boot's slot. After the reboot,omarchy-mac-migrate-verifycompleted: "This Mac now runs repository https://pkgs.omarchy.org/edge/$arch". The booted kernel islinux-aurora 7.1.12.aurora2-11through Limine, the root unlocks viard.luks.name=and sd-encrypt, the platform readsaarch64-apple, and there are no failed units.Also hit, not fixed here: the
defaultsstep then failed with "cannot set up Snapper for the root filesystem". The cause is an orphan/.snapshotssubvolume from the fork era (snapper had been installed, then removed, with no config left). Upstream'sinstall/config/snapper.shexits 1, not 3, on "creating btrfs subvolume .snapshots failed since it already exists". I moved it aside by hand and the run finished. It probably belongs upstream:snapper.shcould adopt or set aside an orphan.snapshots, or return 3 for it.🤖 Generated with Claude Code