civodul pushed a commit to branch master
in repository guix.
commit 4892c0186eec75253701c5097803b6168a2956ce
Author: Bruno Victal <[email protected]>
AuthorDate: Sat Feb 25 18:57:50 2023 +0000
services: base: Deprecate 'agetty-service' procedure.
* doc/guix.texi (Base Services): Replace agetty-service with
agetty-service-type.
* gnu/services/base.scm (agetty-service): Deprecate procedure.
* gnu/system/examples/beaglebone-black.tmpl
(operating-system)[services]: Use agetty-service-type.
Signed-off-by: Ludovic Courtès <[email protected]>
---
doc/guix.texi | 17 ++++++++---------
gnu/services/base.scm | 5 +++--
gnu/system/examples/beaglebone-black.tmpl | 14 +++++++-------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 06f77639ce..de7b61432e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -18160,19 +18160,18 @@ The Mingetty package to use.
@end table
@end deftp
-@deffn {Scheme Procedure} agetty-service @var{config}
-Return a service to run agetty according to @var{config}, an
-@code{<agetty-configuration>} object, which specifies the tty to run,
-among other things.
-@end deffn
+@defvar agetty-service-type
+Type of the service that runs agetty, which implements virtual and
+serial console log-in. The value for this service is a
+@code{<agetty-configuration>} object.
+@end defvar
@deftp {Data Type} agetty-configuration
-This is the data type representing the configuration of agetty, which
-implements virtual and serial console log-in. See the @code{agetty(8)}
-man page for more information.
+Data type representing the configuration of agetty, which specifies the
+tty to run, among other things@footnote{See the @code{agetty(8)}
+man page for more information.}.
@table @asis
-
@item @code{tty}
The name of the console this agetty runs on, as a string---e.g.,
@code{"ttyS0"}. This argument is optional, it will default to
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index c762485054..c5fd0cf5b4 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -162,7 +162,7 @@
agetty-configuration
agetty-configuration?
- agetty-service
+ agetty-service ; deprecated
agetty-service-type
mingetty-configuration
@@ -1210,7 +1210,8 @@ to use as the tty. This is primarily useful for headless
systems."
"Provide console login using the @command{agetty}
program.")))
-(define* (agetty-service config)
+(define-deprecated (agetty-service config)
+ agetty-service-type
"Return a service to run agetty according to @var{config}, which specifies
the tty to run, among other things."
(service agetty-service-type config))
diff --git a/gnu/system/examples/beaglebone-black.tmpl
b/gnu/system/examples/beaglebone-black.tmpl
index 40d0a76a37..18bbb2723c 100644
--- a/gnu/system/examples/beaglebone-black.tmpl
+++ b/gnu/system/examples/beaglebone-black.tmpl
@@ -48,10 +48,10 @@
(services (append (list (service dhcp-client-service-type)
;; mingetty does not work on serial lines.
;; Use agetty with board-specific serial parameters.
- (agetty-service
- (agetty-configuration
- (extra-options '("-L"))
- (baud-rate "115200")
- (term "vt100")
- (tty "ttyO0"))))
- %base-services)))
+ (service agetty-service-type
+ (agetty-configuration
+ (extra-options '("-L"))
+ (baud-rate "115200")
+ (term "vt100")
+ (tty "ttyO0"))))
+ %base-services)))
