[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/18: services: network-manager: Add 'shepherd-requirement' field.
From: |
guix-commits |
Subject: |
02/18: services: network-manager: Add 'shepherd-requirement' field. |
Date: |
Fri, 10 Mar 2023 11:41:42 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 7777d767a43ec73539cf386311feee2f683ead92
Author: Bruno Victal <mirai@makinata.eu>
AuthorDate: Tue Mar 7 12:43:58 2023 +0000
services: network-manager: Add 'shepherd-requirement' field.
Note: This also makes wpa-supplicant an optional requirement.
* gnu/services/networking.scm (<network-manager-configuration>)
[shepherd-requirement]: New field.
(network-manager-shepherd-service): Honor it.
(network-manager-configuration-shepherd-requirement): Export accessor.
* doc/guix.texi (Networking Setup): Document it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
doc/guix.texi | 6 ++++++
gnu/services/networking.scm | 10 +++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 6671ba9305..ed518cbcb8 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19836,6 +19836,12 @@ Data type representing the configuration of
NetworkManager.
@item @code{network-manager} (default: @code{network-manager})
The NetworkManager package to use.
+@item @code{shepherd-requirement} (default: @code{'(wpa-supplicant)})
+This option can be used to provide a list of symbols naming Shepherd services
+that this service will depend on, such as @code{'wpa-supplicant} or
+@code{'iwd} if you require authenticated access for encrypted WiFi or Ethernet
+networks.
+
@item @code{dns} (default: @code{"default"})
Processing mode for DNS, which affects how NetworkManager uses the
@code{resolv.conf} configuration file.
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index dacf64c2d1..4a3d5b887f 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -143,6 +143,7 @@
network-manager-configuration
network-manager-configuration?
+ network-manager-configuration-shepherd-requirement
network-manager-configuration-dns
network-manager-configuration-vpn-plugins
network-manager-service-type
@@ -1140,6 +1141,8 @@ project's documentation} for more information."
network-manager-configuration?
(network-manager network-manager-configuration-network-manager
(default network-manager))
+ (shepherd-requirement network-manager-configuration-shepherd-requirement
+ (default '(wpa-supplicant)))
(dns network-manager-configuration-dns
(default "default"))
(vpn-plugins network-manager-configuration-vpn-plugins ;list of file-like
@@ -1200,7 +1203,7 @@ project's documentation} for more information."
(define (network-manager-shepherd-service config)
(match-record config <network-manager-configuration>
- (network-manager dns vpn-plugins iwd?)
+ (network-manager shepherd-requirement dns vpn-plugins iwd?)
(let ((conf (plain-file "NetworkManager.conf"
(string-append
"[main]\ndns=" dns "\n"
@@ -1209,8 +1212,9 @@ project's documentation} for more information."
(list (shepherd-service
(documentation "Run the NetworkManager.")
(provision '(networking))
- (requirement (append '(user-processes dbus-system loopback)
- (if iwd? '(iwd) '(wpa-supplicant))))
+ (requirement `(user-processes dbus-system loopback
+ ,@shepherd-requirement
+ ,@(if iwd? '(iwd) '())))
(start #~(make-forkexec-constructor
(list (string-append #$network-manager
"/sbin/NetworkManager")
- branch master updated (4f4e4abd3a -> f437b11180), guix-commits, 2023/03/10
- 02/18: services: network-manager: Add 'shepherd-requirement' field.,
guix-commits <=
- 04/18: services: connman: Use match-record and export accessors., guix-commits, 2023/03/10
- 07/18: services: network-manager: Await for NetworkManager to finish starting up., guix-commits, 2023/03/10
- 10/18: services: xorg: Deprecate 'screen-locker-service' procedure., guix-commits, 2023/03/10
- 11/18: doc: Sending-a-Patch-Series: Fix URL., guix-commits, 2023/03/10
- 03/18: services: network-manager: Deprecate 'iwd?' field., guix-commits, 2023/03/10
- 05/18: services: connman: Add 'shepherd-requirement' field., guix-commits, 2023/03/10
- 06/18: services: connman: Deprecate 'iwd?' field., guix-commits, 2023/03/10
- 01/18: build-system/gnu: Remove 'install-license-files' from '%dist-phases'., guix-commits, 2023/03/10
- 08/18: services: network-manager: Set service canonical-name to NetworkManager., guix-commits, 2023/03/10
- 09/18: services: connman: Set service canonical-name to connman., guix-commits, 2023/03/10