[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#61587] [PATCH v2 1/8] services: network-manager: Add 'shepherd-requ
From: |
Bruno Victal |
Subject: |
[bug#61587] [PATCH v2 1/8] services: network-manager: Add 'shepherd-requirement' field. |
Date: |
Fri, 3 Mar 2023 22:59:06 +0000 |
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.
---
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 74658dbc86..4599c87a72 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19836,6 +19836,12 @@ Networking Setup
@item @code{network-manager} (default: @code{network-manager})
The NetworkManager package to use.
+@item @code{shepherd-requirement} (default: @code{()})
+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..5284855b83 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -143,6 +143,7 @@ (define-module (gnu services networking)
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 @@ (define-record-type* <network-manager-configuration>
network-manager-configuration?
(network-manager network-manager-configuration-network-manager
(default network-manager))
+ (shepherd-requirement network-manager-configuration-shepherd-requirement
+ (default '()))
(dns network-manager-configuration-dns
(default "default"))
(vpn-plugins network-manager-configuration-vpn-plugins ;list of file-like
@@ -1200,7 +1203,7 @@ (define (network-manager-environment config)
(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 @@ (define (network-manager-shepherd-service config)
(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")
base-commit: 6a1464b0cc8c0b3e53d2580661a8c69d79f183ab
--
2.39.1
- [bug#61587] [PATCH v2 1/8] services: network-manager: Add 'shepherd-requirement' field.,
Bruno Victal <=
- [bug#61587] [PATCH v2 8/8] services: connman: Set service canonical-name to connman., Bruno Victal, 2023/03/03
- [bug#61587] [PATCH v2 5/8] services: connman: Deprecate 'iwd?' field., Bruno Victal, 2023/03/03
- [bug#61587] [PATCH v2 4/8] services: connman: Add 'shepherd-requirement' field., Bruno Victal, 2023/03/03
- [bug#61587] [PATCH v2 2/8] services: network-manager: Deprecate 'iwd?' field., Bruno Victal, 2023/03/03
- [bug#61587] [PATCH v2 3/8] services: connman: Use match-record and export accessors., Bruno Victal, 2023/03/03
- [bug#61587] [PATCH v2 6/8] services: network-manager: Await for NetworkManager to finish starting up., Bruno Victal, 2023/03/03
- [bug#61587] [PATCH v2 7/8] services: network-manager: Set service canonical-name to NetworkManager., Bruno Victal, 2023/03/03
- [bug#61587] [PATCH 0/8] networking services refactoring, Ludovic Courtès, 2023/03/07