~ruther/guix-local

e8185fc4d5e7c654f1781a35b51de71b4df20180 — Maxim Cournoyer 1 year, 21 days ago 4d9eea9
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
2 files changed, 7 insertions(+), 7 deletions(-)

M doc/guix.texi
M gnu/services/base.scm
M doc/guix.texi => doc/guix.texi +5 -5
@@ 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

M gnu/services/base.scm => gnu/services/base.scm +2 -2
@@ 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