summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Victal <mirai@makinata.eu>2023-02-25 18:57:55 +0000
committerLudovic Courtès <ludo@gnu.org>2023-03-03 17:55:33 +0100
commit31b1e229268683826524cb93dd2da8d46dd77343 (patch)
treed9a5cb4eac12634331626b49a0a10e59888f30ad
parent2e7516168e7b27d1ad3cee60d337d2ad98fb09ff (diff)
services: base: Deprecate 'rngd-service' procedure.
* doc/guix.texi (Base Services): Replace rngd-service with rngd-service-type. Document <rngd-configuration>. * gnu/services/base.scm (<rngd-configuration>): Set default values from the values in the now deprecated 'rngd-service' procedure. (rngd-service): Deprecate procedure. (rngd-service-type): Set default value. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--doc/guix.texi25
-rw-r--r--gnu/services/base.scm15
2 files changed, 27 insertions, 13 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index f4bfb8a24f..1edbad33c6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -18919,13 +18919,24 @@ seconds for the negative lookups. @xref{Invoking guix publish,
@end table
@end deftp
-@anchor{rngd-service}
-@deffn {Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @
- [#:device "/dev/hwrng"]
-Return a service that runs the @command{rngd} program from @var{rng-tools}
-to add @var{device} to the kernel's entropy pool. The service will fail if
-@var{device} does not exist.
-@end deffn
+@defvar rngd-service-type
+Type of the service that runs rng-tools rngd, whose value is a
+@code{<rngd-configuration>} object.
+@end defvar
+
+@deftp {Data Type} rngd-configuration
+Data type representing the configuration of rngd.
+
+@table @asis
+@item @code{rng-tools} (default: @code{rng-tools}) (type: file-like)
+Package object of the rng-tools rngd.
+
+@item @code{device} (default: @var{"/dev/hwrng"}) (type: string)
+Path of the device to add to the kernel's entropy pool. The service
+will fail if @var{device} does not exist.
+
+@end table
+@end deftp
@anchor{pam-limits-service}
@cindex session limits
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index b183cf58c1..1423ab6767 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -239,7 +239,7 @@
rngd-configuration
rngd-configuration?
rngd-service-type
- rngd-service
+ rngd-service ; deprecated
kmscon-configuration
kmscon-configuration?
@@ -662,8 +662,10 @@ down.")))
(define-record-type* <rngd-configuration>
rngd-configuration make-rngd-configuration
rngd-configuration?
- (rng-tools rngd-configuration-rng-tools) ;file-like
- (device rngd-configuration-device)) ;string
+ (rng-tools rngd-configuration-rng-tools ;file-like
+ (default rng-tools))
+ (device rngd-configuration-device ;string
+ (default "/dev/hwrng")))
(define rngd-service-type
(shepherd-service-type
@@ -682,12 +684,13 @@ down.")))
(provision '(trng))
(start #~(make-forkexec-constructor '#$rngd-command))
(stop #~(make-kill-destructor))))
+ (rngd-configuration)
(description "Run the @command{rngd} random number generation daemon to
supply entropy to the kernel's pool.")))
-(define* (rngd-service #:key
- (rng-tools rng-tools)
- (device "/dev/hwrng"))
+(define-deprecated (rngd-service #:key (rng-tools rng-tools)
+ (device "/dev/hwrng"))
+ rngd-service-type
"Return a service that runs the @command{rngd} program from @var{rng-tools}
to add @var{device} to the kernel's entropy pool. The service will fail if
@var{device} does not exist."