[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#61587] [PATCH v3 4/8] services: connman: Add 'shepherd-requirement'
From: |
Bruno Victal |
Subject: |
[bug#61587] [PATCH v3 4/8] services: connman: Add 'shepherd-requirement' field. |
Date: |
Tue, 7 Mar 2023 12:44:01 +0000 |
* gnu/services/networking.scm (<connman-configuration>)
[shepherd-requirement]: New field.
(connman-shepherd-service): Honor it.
(connman-configuration-shepherd-requirement): Export accessor.
* doc/guix.texi (Networking Setup): Document it.
---
doc/guix.texi | 6 ++++++
gnu/services/networking.scm | 12 ++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index ccaca0a71b..ece0c0354d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19917,6 +19917,12 @@ Networking Setup
@item @code{connman} (default: @var{connman})
The connman 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{disable-vpn?} (default: @code{#f})
When true, disable connman's vpn plugin.
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index abfaba8004..6a09f6e728 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -151,6 +151,7 @@ (define-module (gnu services networking)
connman-configuration
connman-configuration?
connman-configuration-connman
+ connman-configuration-shepherd-requirement
connman-configuration-disable-vpn?
connman-configuration-iwd?
connman-service-type
@@ -1288,6 +1289,8 @@ (define-record-type* <connman-configuration>
connman-configuration?
(connman connman-configuration-connman
(default connman))
+ (shepherd-requirement connman-configuration-shepherd-requirement
+ (default '()))
(disable-vpn? connman-configuration-disable-vpn?
(default #f))
(iwd? connman-configuration-iwd?
@@ -1303,13 +1306,14 @@ (define (connman-activation config)
(mkdir-p "/var/lib/connman-vpn/"))))))
(define (connman-shepherd-service config)
- (match-record config <connman-configuration> (connman disable-vpn? iwd?)
+ (match-record config <connman-configuration> (connman shepherd-requirement
+ disable-vpn? iwd?)
(list (shepherd-service
(documentation "Run Connman")
(provision '(networking))
- (requirement
- (append '(user-processes dbus-system loopback)
- (if iwd? '(iwd) '())))
+ (requirement `(user-processes dbus-system loopback
+ ,@shepherd-requirement
+ ,@(if iwd? '(iwd) '())))
(start #~(make-forkexec-constructor
(list (string-append #$connman
"/sbin/connmand")
--
2.39.1
- [bug#61587] [PATCH v3 1/8] services: network-manager: Add 'shepherd-requirement' field., Bruno Victal, 2023/03/07
- [bug#61587] [PATCH v3 2/8] services: network-manager: Deprecate 'iwd?' field., Bruno Victal, 2023/03/07
- [bug#61587] [PATCH v3 4/8] services: connman: Add 'shepherd-requirement' field.,
Bruno Victal <=
- [bug#61587] [PATCH v3 6/8] services: network-manager: Await for NetworkManager to finish starting up., Bruno Victal, 2023/03/07
- [bug#61587] [PATCH v3 7/8] services: network-manager: Set service canonical-name to NetworkManager., Bruno Victal, 2023/03/07
- [bug#61587] [PATCH v3 3/8] services: connman: Use match-record and export accessors., Bruno Victal, 2023/03/07
- [bug#61587] [PATCH v3 5/8] services: connman: Deprecate 'iwd?' field., Bruno Victal, 2023/03/07
- [bug#61587] [PATCH v3 8/8] services: connman: Set service canonical-name to connman., Bruno Victal, 2023/03/07
- bug#61587: [PATCH v3 1/8] services: network-manager: Add 'shepherd-requirement' field., Ludovic Courtès, 2023/03/10