sxhkd: stop scope before creating #2086
Merged
Conversation
This file contains 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
berbiche
reviewed
Jun 9, 2021
modules/services/sxhkd.nix
Outdated
| @@ -73,6 +73,7 @@ in | |||
| ]; | |||
|
|
|||
| xsession.initExtra = '' | |||
| systemctl --user stop sxhkd.scope | |||
There was a problem hiding this comment.
Suggested change
| systemctl --user stop sxhkd.scope | |
| systemctl --user stop sxhkd.scope || true |
If an error occurs, is the script evaluation aborted?
There was a problem hiding this comment.
No, just throw an error to journal. I added check if scope is active.
0xKDI
force-pushed
the
sxhkd-fix
branch
4 times, most recently
from
3f019b6 to
fcd077b
Compare
ncfavier
requested changes
Jun 10, 2021
modules/services/sxhkd.nix
Outdated
Comment on lines
76
to
77
| [[ $(systemctl is-active --user sxhkd.scope) == active ]] \ | ||
| && systemctl --user stop sxhkd.scope |
There was a problem hiding this comment.
Suggested change
| [[ $(systemctl is-active --user sxhkd.scope) == active ]] \ | |
| && systemctl --user stop sxhkd.scope | |
| systemctl --user stop sxhkd.scope 2> /dev/null || true |
This runs into a race condition where the scope is stopped between the two systemctl calls.
Don't check, handle failure.
ncfavier
approved these changes
Jun 11, 2021
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.
Description
This allows relogging into graphical session.
Checklist
Change is backwards compatible.
Code formatted with
./format.Code tested through
nix-shell --pure tests -A run.all.Test cases updated/added. See example.
Commit messages are formatted like
See CONTRIBUTING for more information and recent commit messages for examples.
If this PR adds a new module
Added myself as module maintainer. See example.
Added myself and the module files to
.github/CODEOWNERS.