diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2018-10-28 17:31:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-28 17:31:35 +0100 |
| commit | deacd0bd7325dea00d0e70b7255443c16541a4bc (patch) | |
| tree | 934a4e465c3ce93897a8ad8760aacf317e7fd7ba /nixos/modules/security | |
| parent | 7c0fbdfc70e669bb4d162a8caab4b2056f047b59 (diff) | |
nixos/rngd: fix exec flags and udev rules
TPM1.2 support has been dropped in rng-tools v6.5
see https://github.com/nhorman/rng-tools/commit/caef8cce97396adc8c60749a0ce6ac039b57859a
rngd won't access /dev/tpm0 anymore and the "--no-tpm=1" option is now unrecognised
Diffstat (limited to 'nixos/modules/security')
| -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 81e04a44b115..63e00b548120 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -20,7 +20,6 @@ with lib; KERNEL=="random", TAG+="systemd" SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" KERNEL=="hw_random", 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 = { @@ -30,8 +29,7 @@ with lib; description = "Hardware RNG Entropy Gatherer Daemon"; - serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v" + - (if config.services.tcsd.enable then " --no-tpm=1" else ""); + serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v"; }; }; } |