[fix] Repair update holds in existing guests - #185
Open
Fail-Safe wants to merge 1 commit into
Open
Conversation
This was referenced Sep 11, 2026
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.
Older guests can still fail Omarchy Update with conflicting
libaquamarine.sodependencies after updating the Mac app. The current factory hold list does not migrate into existing disks, and editing only/etc/pacman.confis temporary: the pre-refresh hook restores/usr/share/try-omarchy/pacman.confover it.Add an explicit, standalone
guest/scripts/repair-update-holds.pymaintenance command for existing ARM guests. It previews by default and requires root plus--applyto add missing kernel, kernel-header, Hyprland, aquamarine, and Hyprtoolkit holds to both configurations. It preserves each file's existing settings and comments, backs up both originals, cooperates with the pacman transaction lock, and restores the first file if writing the second fails. Repeat runs make no changes once both files are correct.The README explains how to copy and run the command inside an existing guest, restore backups, and keep custom settings in the saved configuration that the update hook uses. This does not change factory package pins, install packages, or recover an already incompatible installed package set. Existing guests must explicitly run the repair; merely updating the Mac app still does not migrate them.
Validation:
make testpassed, including 114 guest tests, 242 native tests, and shell/storage contracts. The existing virtio-pinch guest ABI test was skipped becauseQEMU_PINCH_TEST_BINARYwas not set.Eleven repair tests cover custom settings, multiple hold directives, missing directives, line endings, factory hold parity, preview behavior, backups/modes, restore-and-repeat behavior, malformed files, symlinks, transaction locks, and rollback.
On an existing ARM guest, resolution against its stale saved template exited 1 with the Hyprtoolkit
libaquamarine.so=14-64dependency conflict. A temporary copy produced by this command parsed successfully withpacman-conf, andpacman -Supagainst it exited 0 using the same synchronized package databases. No packages were installed or upgraded for this check.End-to-end existing-guest validation: the user applied the repair successfully. The next update encountered the separate 10 GiB free-space requirement; after enlarging the VM disk using the existing resize tool, the user confirmed that Omarchy Update completed successfully.
Fixes #147.