mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-14 11:00:36 +02:00
Code Releases Activity

services: Rename field in greetd-terminal-configuration record.

Browse source 
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
This commit is contained in:
Maxim Cournoyer 2025-02-07 17:40:58 +09:00
parent 4d9eea998b
commit e8185fc4d5
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/guix.texi
View file

@ -20571,9 +20571,9 @@ Configuration record for per terminal greetd daemon service.
@item @code{greetd} (default: @code{greetd}) @item @code{greetd} (default: @code{greetd})
The greetd package to use. The greetd package to use.
@item @code{shepherd-requirement} (default: @code{'()}) @item @code{extra-shepherd-requirement} (default: @code{'()})
This option can be used to provide a list of additional symbols naming This option can be used to provide a list of @emph{additional} symbols
Shepherd services that this service will depend on, such as naming Shepherd services that this service will depend on, such as
@code{'seatd} or @code{'elogind} when the terminal session is a @code{'seatd} or @code{'elogind} when the terminal session is a
graphical greeter. graphical greeter.
@ -20718,7 +20718,7 @@ Here is an example of a greetd configuration that uses wlgreet and Sway:
(terminals (terminals
(list (greetd-terminal-configuration (list (greetd-terminal-configuration
;; Sway requires seatd service. ;; Sway requires seatd service.
(shepherd-requirement '(seatd)) (extra-shepherd-requirement '(seatd))
(terminal-vt "1") (terminal-vt "1")
(terminal-switch #t) (terminal-switch #t)
(default-session-command (default-session-command
@ -20740,7 +20740,7 @@ follows:
(terminals (terminals
(list (greetd-terminal-configuration (list (greetd-terminal-configuration
;; Sway requires the seatd service. ;; Sway requires the seatd service.
(shepherd-requirement '(seatd)) (extra-shepherd-requirement '(seatd))
(terminal-vt "1") (terminal-vt "1")
(terminal-switch #t) (terminal-switch #t)
(default-session-command (default-session-command

4
gnu/services/base.scm
View file

@ -3750,7 +3750,7 @@ to handle."
greetd-terminal-configuration make-greetd-terminal-configuration greetd-terminal-configuration make-greetd-terminal-configuration
greetd-terminal-configuration? greetd-terminal-configuration?
(greetd greetd-package (default greetd)) (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) (config-file-name greetd-config-file-name (thunked)
(default (default-config-file-name this-record))) (default (default-config-file-name this-record)))
(log-file-name greetd-log-file-name (thunked) (log-file-name greetd-log-file-name (thunked)
@ -3889,7 +3889,7 @@ to handle."
(greetd-conf (make-greetd-terminal-configuration-file tc)) (greetd-conf (make-greetd-terminal-configuration-file tc))
(greetd-log (greetd-log-file-name tc)) (greetd-log (greetd-log-file-name tc))
(greetd-vt (greetd-terminal-vt tc)) (greetd-vt (greetd-terminal-vt tc))
(greetd-requirement (greetd-shepherd-requirement tc))) (greetd-requirement (greetd-extra-shepherd-requirement tc)))
(shepherd-service (shepherd-service
(documentation "Minimal and flexible login manager daemon") (documentation "Minimal and flexible login manager daemon")
(requirement `(pam user-processes host-name udev virtual-terminal (requirement `(pam user-processes host-name udev virtual-terminal