summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2025-02-07 17:40:58 +0900
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2025-02-07 17:50:21 +0900
commite8185fc4d5e7c654f1781a35b51de71b4df20180 (patch)
tree51c5b8e232d307d25bd9c1d22ba3da64fc9301bc
parent4d9eea998b015056a266c46b9a6c4293388680f9 (diff)
services: Rename field in greetd-terminal-configuration record.
This was erroneously renamed during the review of commit ee0d1b144c ("services: greetd: Improve greeter configurations."). The field *adds* to the intrinsic requirements of the service, so the 'extra-' prefixes communicates this better. * gnu/services/base.scm (<greetd-terminal-configuration>): Rename shepherd-requirement field to extra-shepherd-requirement. * doc/guix.texi (Base Services): Adjust doc accordingly. Change-Id: I4b970bdd63864ed86d61fde9cad2487a293417ce
-rw-r--r--doc/guix.texi10
-rw-r--r--gnu/services/base.scm4
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 9f1e4bf0f0..a5194d7c58 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -20571,9 +20571,9 @@ Configuration record for per terminal greetd daemon service.
@item @code{greetd} (default: @code{greetd})
The greetd package to use.
-@item @code{shepherd-requirement} (default: @code{'()})
-This option can be used to provide a list of additional symbols naming
-Shepherd services that this service will depend on, such as
+@item @code{extra-shepherd-requirement} (default: @code{'()})
+This option can be used to provide a list of @emph{additional} symbols
+naming Shepherd services that this service will depend on, such as
@code{'seatd} or @code{'elogind} when the terminal session is a
graphical greeter.
@@ -20718,7 +20718,7 @@ Here is an example of a greetd configuration that uses wlgreet and Sway:
(terminals
(list (greetd-terminal-configuration
;; Sway requires seatd service.
- (shepherd-requirement '(seatd))
+ (extra-shepherd-requirement '(seatd))
(terminal-vt "1")
(terminal-switch #t)
(default-session-command
@@ -20740,7 +20740,7 @@ follows:
(terminals
(list (greetd-terminal-configuration
;; Sway requires the seatd service.
- (shepherd-requirement '(seatd))
+ (extra-shepherd-requirement '(seatd))
(terminal-vt "1")
(terminal-switch #t)
(default-session-command
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 8d710114d1..4bc0433def 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -3750,7 +3750,7 @@ to handle."
greetd-terminal-configuration make-greetd-terminal-configuration
greetd-terminal-configuration?
(greetd greetd-package (default greetd))
- (shepherd-requirement greetd-shepherd-requirement (default '()))
+ (extra-shepherd-requirement greetd-extra-shepherd-requirement (default '()))
(config-file-name greetd-config-file-name (thunked)
(default (default-config-file-name this-record)))
(log-file-name greetd-log-file-name (thunked)
@@ -3889,7 +3889,7 @@ to handle."
(greetd-conf (make-greetd-terminal-configuration-file tc))
(greetd-log (greetd-log-file-name tc))
(greetd-vt (greetd-terminal-vt tc))
- (greetd-requirement (greetd-shepherd-requirement tc)))
+ (greetd-requirement (greetd-extra-shepherd-requirement tc)))
(shepherd-service
(documentation "Minimal and flexible login manager daemon")
(requirement `(pam user-processes host-name udev virtual-terminal