Repository navigation
Test the settings packages' etc-overrides on both platforms - #1927
Merged
Merged
Conversation
The lifecycle test replaces _etc_overrides_apply with a no-op, so nothing caught the Apple Silicon early return that skipped every override but os-release, and nothing would catch it coming back. Run each settings package's real function against a scratch root, its paths rewritten and refused if any still reaches the system, on Apple Silicon and elsewhere, with cups-browsed installed and not. Every override lands with mode 644 on both platforms; os-release stays Arch Linux ARM's symlink on Apple Silicon; cups-browsed.conf is never created before its package. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ryanrhughes
enabled auto-merge (squash)
October 31, 2026 14:57
stevederico
pushed a commit
to stevederico/omarchy-pkgs
that referenced
this pull request
Oct 31, 2026
) The lifecycle test replaces _etc_overrides_apply with a no-op, so nothing caught the Apple Silicon early return that skipped every override but os-release, and nothing would catch it coming back. Run each settings package's real function against a scratch root, its paths rewritten and refused if any still reaches the system, on Apple Silicon and elsewhere, with cups-browsed installed and not. Every override lands with mode 644 on both platforms; os-release stays Arch Linux ARM's symlink on Apple Silicon; cups-browsed.conf is never created before its package. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
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.
Follow-up to #1857, adding the regression coverage Greptile asked for there (#1857 (comment)).
tests/passwordless-package-lifecycle.pyreplaces_etc_overrides_applywith a no-op, so nothing caught the Apple Silicon early return, or would catch it coming back.tests/settings-etc-overrides.shruns each settings package's real_etc_overrides_applyagainst a scratch root. It rewrites every absolute path into that root and refuses to run if any still points at the real system. It covers 8 cases:omarchy-settingsandomarchy-settings-dev, on Apple Silicon and elsewhere, withcups-browsed.confpresent and absent. It checks that:faillock.conf,nsswitch.conf,plymouthd.confand/etc/skel/.bashrcare Omarchy's, mode 644, on both platforms;/etc/os-releaseis the../usr/lib/os-releasesymlink on Apple Silicon, and Omarchy's file, mode 644, elsewhere;cups-browsed.confgets Omarchy's version, mode 644, when present, and is never created when absent.The
cups-files.confbranch is left out: it needs root tochownto the cups group, and the platform change didn't touch it.It runs in the self-tests job next to
settings-boot-config.sh.Testing
master./etc/nsswitch.conf is not Omarchy's, mode 644.🤖 Generated with Claude Code