nixos: add StateDirectory for fprintd
#62088
Merged
+7
−0
Conversation
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
ofborg
bot
added
6.topic: nixos
infinisil
reviewed
May 26, 2019
| @@ -50,6 +50,14 @@ in | |||
|
|
|||
| systemd.packages = [ cfg.package ]; | |||
|
|
|||
| # The upstream unit does not use StateDirectory, so will | |||
| # fail if the directory it needs is not present. Should be | |||
There was a problem hiding this comment.
I'm pretty sure systemd.services.fprintd.serviceConfig.StateDirectory = "fprint" works too, should get merged with the upstream unit
There was a problem hiding this comment.
Huh, does that work even when there's an existing upstream unit that we use?
There was a problem hiding this comment.
Great, seems to work. I'll use that instead.
There was a problem hiding this comment.
Yeah I found out about this too recently, seems that systemd can merge multiple unit files at runtime.
michaelpj
force-pushed
the
fix/fprintd-state-dir
branch
from
8717e32 to
9131bf5
Compare
michaelpj
changed the title
StateDirectory for fprintd
infinisil
approved these changes
May 26, 2019
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
Fixes #62082. There is a MR open upstream to fix this with
StateDirectory, but for now this seems like a good fix.cc @abbradar
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)