rngd_linux: Log a warning if write_wakeup_threshold can't be adjusted

[thirdparty/rng-tools.git] / rngd.c

diff --git a/rngd.c b/rngd.c
index 9819ed5301c4ba2871b7f55c6ae0b06a056918e6..f1b7e1a9165faf0cd75a9b1554c3704a9c6f4bbe 100644 (file)
--- a/rngd.c
+++ b/rngd.c
@@ -84,7 +84,7 @@ static struct argp_option options[] = {
          "Kernel device used for random number output (default: /dev/random)" },
 
        { "rng-device", 'r', "file", 0,
-         "Kernel device used for random number input (default: /dev/hw_random)" },
+         "Kernel device used for random number input (default: /dev/hwrng)" },
 
        { "pid-file", 'p', "file", 0,
          "File used for recording daemon PID, and multiple exclusion (default: /var/run/rngd.pid)" },
@@ -112,7 +112,6 @@ static struct arguments default_arguments = {
        .random_name    = "/dev/random",
        .pid_file       = "/var/run/rngd.pid",
        .random_step    = 64,
-       .fill_watermark = 2048,
        .daemon         = true,
        .enable_drng    = true,
        .enable_tpm     = true,
@@ -122,7 +121,7 @@ static struct arguments default_arguments = {
 struct arguments *arguments = &default_arguments;
 
 static struct rng rng_default = {
-       .rng_name       = "/dev/hw_random",
+       .rng_name       = "/dev/hwrng",
        .rng_fd         = -1,
        .xread          = xread,
 };
@@ -292,6 +291,9 @@ int main(int argc, char **argv)
 
        openlog("rngd", 0, LOG_DAEMON);
 
+       /* Get the default watermark level for this platform */
+       arguments->fill_watermark = default_watermark();
+
        /* Parsing of commandline parameters */
        argp_parse(&argp, argc, argv, 0, 0, arguments);