1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-22 00:55:56 +02:00

services: dhcpcd: Add shepherd-provision field.

* doc/guix.texi (Networking Setup)<dhcpcd-configuration>: Regenerate
the dhcpcd-configuration documentation.
* gnu/services/networking.scm (dhcpcd-configuration)
<shepherd-provision>: Add new field.  Fix typo in client-id description.
(dhcpcd-shepherd-service): Use it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Alexey Abramov
2025-09-23 11:44:58 +02:00
committed by Ludovic Courtès
parent ea4eeeed03
commit 7365e16db8
2 changed files with 19 additions and 4 deletions
+11 -1
View File
@@ -22096,6 +22096,9 @@ resolver:
@end lisp
@end defvar
@c %start of fragment
@deftp {Data Type} dhcpcd-configuration
Available @code{dhcpcd-configuration} fields are:
@@ -22150,11 +22153,15 @@ refer to @uref{https://www.rfc-editor.org/rfc/rfc2132#section-9.13,RFC
@item @code{client-id} (type: maybe-string)
Use the interface hardware address or the given string as a client
identifier, this is matually exclusive with the @code{duid} option.
identifier, this is mutually exclusive with the @code{duid} option.
@item @code{extra-content} (type: maybe-string)
Extra content to append to the configuration as-is.
@item @code{shepherd-provision} (default: @code{(networking)}) (type: list-of-symbols)
This is a list of symbols naming Shepherd services provided by this
service.
@item @code{shepherd-requirement} (default: @code{()}) (type: list-of-symbols)
This is a list of symbols naming Shepherd services that this service
will depend on.
@@ -22163,6 +22170,9 @@ will depend on.
@end deftp
@c %end of fragment
@cindex NetworkManager
@defvar network-manager-service-type
+8 -3
View File
@@ -629,13 +629,18 @@ to @uref{https://www.rfc-editor.org/rfc/rfc2132#section-9.13,RFC 2132}.")
(client-id
maybe-string
"Use the interface hardware address or the given string as a client identifier,
this is matually exclusive with the @code{duid} option.")
this is mutually exclusive with the @code{duid} option.")
;; Escape hatch for the generated configuration file.
(extra-content
maybe-string
"Extra content to append to the configuration as-is.")
(shepherd-provision
(list-of-symbols '(networking))
"This is a list of symbols naming Shepherd services provided by this service."
empty-serializer)
(shepherd-requirement
(list-of-symbols '())
"This is a list of symbols naming Shepherd services that this service
@@ -662,11 +667,11 @@ will depend on."
(define (dhcpcd-shepherd-service config)
(match-record config <dhcpcd-configuration>
(command-arguments interfaces shepherd-requirement)
(command-arguments interfaces shepherd-provision shepherd-requirement)
(let ((config-file (dhcpcd-config-file config)))
(list (shepherd-service
(documentation "dhcpcd daemon.")
(provision '(networking))
(provision shepherd-provision)
(requirement `(user-processes udev ,@shepherd-requirement))
(actions (list (shepherd-configuration-action config-file)))
(start