fix(nix/greeter): skip invalid customThemeFile in preStart#1997
Merged
LuckShiba merged 2 commits intoAvengeMedia:masterfrom Mar 15, 2026
Merged
fix(nix/greeter): skip invalid customThemeFile in preStart#1997LuckShiba merged 2 commits intoAvengeMedia:masterfrom
LuckShiba merged 2 commits intoAvengeMedia:masterfrom
Conversation
5 tasks
LuckShiba
reviewed
Mar 14, 2026
Avoid attempting to copy a null/empty/missing customThemeFile path by validating the jq result and file existence before cp. Update distro/nix/greeter.nix Co-authored-by: Lucas <43530291+LuckShiba@users.noreply.github.com>
Collaborator
|
Happy to merge when you all think it's good to go |
Contributor
Author
|
Changes addressed, PTAL If this PR is accepted, I will submit the same changes to the dms module in the nixpkgs repo |
Collaborator
|
It seems to work in my system. I added back the |
LuckShiba
approved these changes
Mar 15, 2026
Collaborator
|
@LuckShiba, please me sure I didn't break anything via 1661d32 |
Collaborator
|
Re-testing now! |
Collaborator
|
Seems to work with 1661d32. |
bbedward
pushed a commit
that referenced
this pull request
Mar 20, 2026
* fix(nix/greeter): skip invalid customThemeFile in preStart Avoid attempting to copy a null/empty/missing customThemeFile path by validating the jq result and file existence before cp. Update distro/nix/greeter.nix Co-authored-by: Lucas <43530291+LuckShiba@users.noreply.github.com> * nix/greeter: update customTheme verification --------- Co-authored-by: Lucas <43530291+LuckShiba@users.noreply.github.com> Co-authored-by: LuckShiba <luckshiba@protonmail.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
3 participants
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.
Avoid attempting to copy a null/empty/missing customThemeFile path by validating the jq result and file existence before cp.
The default implementation of wrap systemd script in Nix is "set -e", so the code is interrupted here.