From dbc0395b2bc357ee9f62e6e8947b3ae83a89d53c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 6 Jan 2015 17:23:36 +0300 Subject: [PATCH] nixos/rngd: some fixes --- nixos/modules/security/rngd.nix | 4 +--- 1 file changed, 1 insertion(+), 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 ]; }; }; }