Merge pull request #61072 from dtzWill/feature/rngd-debug-flag

rngd: add option to run w/debug flag
This commit is contained in:
Will Dietz 2019-05-07 14:59:39 -05:00 committed by GitHub
commit a2bdd63c4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,20 +2,30 @@
with lib; with lib;
let
cfg = config.security.rngd;
in
{ {
options = { options = {
security.rngd.enable = mkOption { security.rngd = {
type = types.bool; enable = mkOption {
default = true; type = types.bool;
description = '' default = true;
Whether to enable the rng daemon, which adds entropy from description = ''
hardware sources of randomness to the kernel entropy pool when Whether to enable the rng daemon, which adds entropy from
available. hardware sources of randomness to the kernel entropy pool when
''; available.
'';
};
debug = mkOption {
type = types.bool;
default = false;
description = "Whether to enable debug output (-d).";
};
}; };
}; };
config = mkIf config.security.rngd.enable { config = mkIf cfg.enable {
services.udev.extraRules = '' services.udev.extraRules = ''
KERNEL=="random", TAG+="systemd" KERNEL=="random", TAG+="systemd"
SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
@ -29,7 +39,10 @@ with lib;
description = "Hardware RNG Entropy Gatherer Daemon"; description = "Hardware RNG Entropy Gatherer Daemon";
serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f"; serviceConfig = {
ExecStart = "${pkgs.rng-tools}/sbin/rngd -f"
+ optionalString cfg.debug " -d";
};
}; };
}; };
} }