diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-01-06 17:23:36 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-01-06 17:27:07 +0300 |
| commit | dbc0395b2bc357ee9f62e6e8947b3ae83a89d53c (patch) | |
| tree | a0f99e3dd955be7c79c8067135fdff5ae3688c65 /nixos/modules/security/rngd.nix | |
| parent | ebf4d5c62baaa9a78a42cb96746886e367c5158e (diff) | |
| download | nixlib-dbc0395b2bc357ee9f62e6e8947b3ae83a89d53c.tar nixlib-dbc0395b2bc357ee9f62e6e8947b3ae83a89d53c.tar.gz nixlib-dbc0395b2bc357ee9f62e6e8947b3ae83a89d53c.tar.bz2 nixlib-dbc0395b2bc357ee9f62e6e8947b3ae83a89d53c.tar.lz nixlib-dbc0395b2bc357ee9f62e6e8947b3ae83a89d53c.tar.xz nixlib-dbc0395b2bc357ee9f62e6e8947b3ae83a89d53c.tar.zst nixlib-dbc0395b2bc357ee9f62e6e8947b3ae83a89d53c.zip | |
nixos/rngd: some fixes
Diffstat (limited to 'nixos/modules/security/rngd.nix')
| -rw-r--r-- | nixos/modules/security/rngd.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index 4d8fabc7696e..b14ea7a5f276 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -20,7 +20,7 @@ with lib; KERNEL=="random", TAG+="systemd" SUBSYSTEM=="cpu", ENV{MODALIAS}=="x86cpu:*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" - KERNEL=="tmp0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" + ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''} ''; systemd.services.rngd = { @@ -32,8 +32,6 @@ with lib; serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" + (if config.services.tcsd.enable then " --no-tpm=1" else ""); - - restartTriggers = [ pkgs.rng_tools ]; }; }; } |