nixos/terraria: Wait for daemon to stop #44631
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
|
cc @joachifm |
joachifm
reviewed
Aug 7, 2018
| @@ -105,14 +115,14 @@ in | |||
| }; | |||
|
|
|||
| config = mkIf cfg.enable { | |||
| users.users.terraria = { | |||
| users.extraUsers.terraria = { | |||
There was a problem hiding this comment.
This change seems unrelated to the PR subject. It is also somewhat redundant as these options are aliased.
| @@ -18,6 +18,16 @@ let | |||
| (boolFlag "secure" cfg.secure) | |||
| (boolFlag "noupnp" cfg.noUPnP) | |||
| ]; | |||
| stopScript = pkgs.writeScript "terraria-stop" '' | |||
| #!${pkgs.stdenv.shell} | |||
There was a problem hiding this comment.
I think pkgs.runtimeShell might be more appropriate, at least in concept.
| RemainAfterExit = true; | ||
| Type = "forking"; | ||
| GuessMainPID = true; | ||
| CapabilityBoundingSet = ""; |
There was a problem hiding this comment.
The capability changes seem strictly unrelated. I'd also expect this to be moot seing as the process runs as non-root to begin with, is there some way it can gain capabilities?
|
@joachifm Thank you for your review! I fixed your mentioned problems |
joachifm
reviewed
Aug 8, 2018
| @@ -18,6 +18,16 @@ let | |||
| (boolFlag "secure" cfg.secure) | |||
| (boolFlag "noupnp" cfg.noUPnP) | |||
| ]; | |||
| stopScript = pkgs.writeScript "terraria-stop" '' | |||
| #!${pkgs.stdenv.runtimeShell} | |||
There was a problem hiding this comment.
Typo here, the correct attribute path is pkgs.runtimeShell
|
@joachifm Fixed and rebased |
|
Thank you |
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.
Motivation for this change
systemd wasn't waiting for the daemon to exit (because it's asynchronous) and hence killed it without saving the world first.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)