diff options
| author | Alexey Abramov <levenson@mmer.org> | 2023-07-25 12:59:56 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-09-17 15:31:03 +0200 |
| commit | 04f71edb73205d0bb82404de28a70ae17b897429 (patch) | |
| tree | 776650e6219794fcf4fb715a8f1d3d4dafab5b23 /gnu/services | |
| parent | 944c1b62a1b36d6383b8e902f1a4abbee0165e34 (diff) | |
services: dhcp-client-configuration: Allow provision override.
* gnu/services/networking.scm (<dhcp-client-configuration>)[shepherd-provision]:
New field.
(dhcp-client-shepherd-service): Honor it.
* doc/guix.texi (Networking Setup): Document it.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/networking.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index e2f6e6c0ca..ec34137d39 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -89,6 +89,7 @@ dhcp-client-configuration? dhcp-client-configuration-package dhcp-client-configuration-interfaces + dhcp-client-configuration-shepherd-provision dhcp-client-configuration-shepherd-requirement dhcpd-service-type @@ -303,6 +304,8 @@ (default isc-dhcp)) (shepherd-requirement dhcp-client-configuration-shepherd-requirement (default '())) + (shepherd-provision dhcp-client-configuration-provision + (default '(networking))) (interfaces dhcp-client-configuration-interfaces (default 'all))) ;'all | list of strings @@ -310,19 +313,19 @@ (match-lambda ((? dhcp-client-configuration? config) (let ((package (dhcp-client-configuration-package config)) - (shepherd-requirement (dhcp-client-configuration-shepherd-requirement config)) + (requirement (dhcp-client-configuration-shepherd-requirement config)) + (provision (dhcp-client-configuration-shepherd-provision config)) (interfaces (dhcp-client-configuration-interfaces config)) (pid-file "/var/run/dhclient.pid")) (list (shepherd-service (documentation "Set up networking via DHCP.") - (requirement `(user-processes udev ,@shepherd-requirement)) + (requirement `(user-processes udev ,@requirement)) + (provision provision) ;; XXX: Running with '-nw' ("no wait") avoids blocking for a minute when ;; networking is unavailable, but also means that the interface is not up ;; yet when 'start' completes. To wait for the interface to be ready, one ;; should instead monitor udev events. - (provision '(networking)) - (start #~(lambda _ (define dhclient (string-append #$package "/sbin/dhclient")) |