[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/18: services: connman: Use match-record and export accessors.
From: |
guix-commits |
Subject: |
04/18: services: connman: Use match-record and export accessors. |
Date: |
Fri, 10 Mar 2023 11:41:43 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 1545dab1fa8a09ac7936e3a9ba1134843f178e1e
Author: Bruno Victal <mirai@makinata.eu>
AuthorDate: Tue Mar 7 12:44:00 2023 +0000
services: connman: Use match-record and export accessors.
* gnu/services/networking.scm (connman-shepherd-service): Use match-record.
(connman-configuration-connman, connman-configuration-disable-vpn?)
(connman-configuration-iwd?): Export accessors.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/services/networking.scm | 52 ++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 27 deletions(-)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index f572de1279..abfaba8004 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -150,6 +150,9 @@
connman-configuration
connman-configuration?
+ connman-configuration-connman
+ connman-configuration-disable-vpn?
+ connman-configuration-iwd?
connman-service-type
modem-manager-configuration
@@ -1300,33 +1303,28 @@ wireless networking."))))
(mkdir-p "/var/lib/connman-vpn/"))))))
(define (connman-shepherd-service config)
- "Return a shepherd service for Connman"
- (and
- (connman-configuration? config)
- (let ((connman (connman-configuration-connman config))
- (disable-vpn? (connman-configuration-disable-vpn? config))
- (iwd? (connman-configuration-iwd? config)))
- (list (shepherd-service
- (documentation "Run Connman")
- (provision '(networking))
- (requirement
- (append '(user-processes dbus-system loopback)
- (if iwd? '(iwd) '())))
- (start #~(make-forkexec-constructor
- (list (string-append #$connman
- "/sbin/connmand")
- "--nodaemon"
- "--nodnsproxy"
- #$@(if disable-vpn? '("--noplugin=vpn") '())
- #$@(if iwd? '("--wifi=iwd_agent") '()))
-
- ;; As connman(8) notes, when passing '-n', connman
- ;; "directs log output to the controlling terminal in
- ;; addition to syslog." Redirect stdout and stderr
- ;; to avoid spamming the console (XXX: for some reason
- ;; redirecting to /dev/null doesn't work.)
- #:log-file "/var/log/connman.log"))
- (stop #~(make-kill-destructor)))))))
+ (match-record config <connman-configuration> (connman disable-vpn? iwd?)
+ (list (shepherd-service
+ (documentation "Run Connman")
+ (provision '(networking))
+ (requirement
+ (append '(user-processes dbus-system loopback)
+ (if iwd? '(iwd) '())))
+ (start #~(make-forkexec-constructor
+ (list (string-append #$connman
+ "/sbin/connmand")
+ "--nodaemon"
+ "--nodnsproxy"
+ #$@(if disable-vpn? '("--noplugin=vpn") '())
+ #$@(if iwd? '("--wifi=iwd_agent") '()))
+
+ ;; As connman(8) notes, when passing '-n', connman
+ ;; "directs log output to the controlling terminal in
+ ;; addition to syslog." Redirect stdout and stderr
+ ;; to avoid spamming the console (XXX: for some reason
+ ;; redirecting to /dev/null doesn't work.)
+ #:log-file "/var/log/connman.log"))
+ (stop #~(make-kill-destructor))))))
(define %connman-log-rotation
(list (log-rotation
- branch master updated (4f4e4abd3a -> f437b11180), guix-commits, 2023/03/10
- 02/18: services: network-manager: Add 'shepherd-requirement' field., guix-commits, 2023/03/10
- 04/18: services: connman: Use match-record and export accessors.,
guix-commits <=
- 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
- 12/18: licenses: Add LPL 1.02 (Lucent Public Licence)., guix-commits, 2023/03/10