Repository navigation
omarchy-mac-migrate: drop aurora-sep's pin block instead of refusing (#778) - #784
joshuaswarren wants to merge 2 commits into
Conversation
Why: a Mac with Touch ID through aurora-sep carries the installer's own IgnorePkg block (linux-aurora, linux-aurora-headers, libfprint, m1n1-aurora). Preflight read it as an administrator hold on packages the migration changes and refused, and the way out the block names (install-aurora-sep.sh --uninstall) does not work on such a Mac. See omacom#778. What: admin_options now reads its input through aurora_sep_pin_dropped, which removes a block opened by "# >>> aurora-sep pin" and closed by "# <<< aurora-sep pin" inside [options]. One place, so the future pacman.conf and the pinned-target check agree: the block is not carried into the new configuration and is not reported as a hold. A block that never closes inside its section, and a hand-written IgnorePkg on the same packages, are kept as written and still refuse. An administrator's own IgnorePkg stays. How proven: three new cases in mac-migrate-legacy-test.sh. The migration of a Mac with the block was refused before the change (observed RED, same "holds back linux-aurora / m1n1-aurora" reasons as the issue); it now reaches its reboot, finishes, keeps "IgnorePkg = firefox" as the only IgnorePkg and replaces linux-aurora and m1n1-aurora. Two direct cases pin the edge rules (open marker at end of file, close marker in another section); a mutant that drops either flush fails them. Full legacy (27), core (48), mx (28) and move (4) suites pass; migrate/build --check is clean. Not done: aurora-sep's other leftovers (aurora-touchid units, its GRUB entry, /var/lib/aurora-sep state) are untouched, and the enclave files stay. The marker text comes from the report in omacom#778, not from the installer source, which I could not find. tool_version is left at 1 like its siblings.
[Medium impact] The PR appears safe to merge; no actionable new issue was established. SummaryThe PR drops closed
Reviews (2) · Last reviewed commit: "Select only hyprland from the aarch64 ed..." · Reviewed by Greptile |
|
Maintainer request: please re-run the failed The job fails with Evidence it is not specific to this branch: run 41294563185 ( The other checks pass on this head: |
|
[Joshua's agent] Source review of the head Confirmed sound. The write path and the refusal check agree because both read through Findings, with line refs:
The stack on #690 is why CI shows no useful run here; I did not evaluate that parent. |
|
Confirming the
So dropping the whole block, including the |
|
[Joshua's agent] Thank you, @patatman. That settles my third finding, and the source says why your result is the expected one rather than luck. The package your migration moved to, What that changes in my review: the libfprint hold was there to stop a stock One caveat for the maintainers, stated as a limit rather than a request: this holds while the channel's |
The edge repository publishes hyprland for aarch64 and does not carry hyprtoolkit or hyprland-guiutils, so naming them as omarchy/ targets made every update and install fail with "target not found" (omacom#741). Only omarchy/hyprland is selected from edge now; the other two come from the regular repositories. The pacman fixture models the real edge repository (hyprland only), the target and ignore-list expectations in the other tests follow, and the Install VM check now expects hyprland from edge and hyprtoolkit, hyprland-guiutils and aquamarine from extra.
|
Found the cause of the failing The edge repository ( The base branch lives upstream and is not mine to update, so I cherry-picked the upstream commit |
|
[Joshua's agent] Review at head
Merging this into the |
|
GREEN at 5030a3b [Joshua's agent] Reviewed the full 13-file diff against stacked base 2976e70, including the bundled ARM package-source adjustments rather than just the aurora-sep filter. The pin filter buffers a managed block until its close marker, flushes it unchanged at a section boundary or EOF, and is shared by the administrator-option read path so preflight and generated configuration agree. Direct checks pass for closed-block removal with neighboring options retained, unterminated EOF preservation and a closing marker in another section. The generated standalone script matches its sources and README checksum (d552e8ad…); migrate/build --check and shell syntax pass. The package-source adjustment restricts explicit edge selection to Hyprland while its companion libraries use the regular repository. Package-source, recovery, file-conflict and package-conflict shell tests all pass. The real pacman temporary-database transaction test also passes its unchanged/upgrade/downgrade cases. No packages were installed on the review host. Test limit: the full legacy migration suite hit a 240-second deadline after its first five passing cases; the later core/mx suites in that command were not reached. I did not rerun that long batch or claim the PR's full-suite counts as my own. The new filter boundary cases were checked separately as above. No blocking findings. No Touch ID hardware, firmware/boot changes, live repository installation or complete migration run. The marker spelling and claimed hardware recovery remain based on the issue evidence, not a fresh reproduction here. Merge with the prerequisite stack and required CI, not as an independently qualified hardware change. Reviewer: Codex GPT-6.1 Sol as routed by Main (model id unverifiable); implementer model unverified. |
Fixes #778. Stacked on #690 (base
mac/migrate-standalone, parent2976e70d).Problem. A Mac with Touch ID through aurora-sep has the installer's own block in
[options]:Preflight reads it as an administrator hold on packages the migration changes and refuses. The way out the block names does not work on such a Mac (details in #778).
Change.
admin_optionsnow reads its input through a newaurora_sep_pin_dropped, which removes a block opened by# >>> aurora-sep pinand closed by# <<< aurora-sep pininside[options]. That is one place, so the newpacman.confand the pinned-target check agree: the block is not carried over and is not reported as a hold. Kept as written, and still refused:IgnorePkgon the same packages outside the blockAn administrator's own
IgnorePkgstays. A failed pre-switch run restores the originalpacman.conf, block included, through the existing backup.Tests (
mac-migrate-legacy-test.sh, +3 cases):IgnorePkg = firefoxruns to its reboot and finishes. The block is gone,firefoxis the onlyIgnorePkgleft, andlinux-auroraandm1n1-auroraare replaced.Observed RED before the change: case 1 refused with the two reasons from the issue. Two mutants (no end-of-file flush, no section-header flush) were each killed by case 3. Full suites on this branch: legacy 27, core 48, mx 28, move 4, all passing;
migrate/build --checkclean.bin/omarchy-mac-migrateand the README checksum are rebuilt.Limits, please read.
libfprinthold.install-aurora-sep.shto confirm it against the installer source. If the installer's markers differ, only the two variables at the top oftarget.shneed to change.aurora-touchidunits, its GRUB entry,/var/lib/aurora-sep*state) are not touched, and the enclave files must stay. I could not verify at source what is a package and what is a script artefact, and deleting enclave state blindly is the wrong risk. The kernel tree it installs outside pacman is Take the Aurora release from the tree the package owns #777's.tool_versionstays 1, like Accept aarch64-apple as the Mac platform in omarchy-mac-migrate #726, Drop the fork's GRUB_FONT once the ESP leaves /boot #727 and Take the Aurora release from the tree the package owns #777. @Knutsi's point that each fix should raise it applies to the whole stack and is better settled once.Written with an AI coding agent (GLM 5.3 and Sonnet routed by the operator); reviewed against the diff and test output above, not by a human maintainer yet.