[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/18: services: connman: Deprecate 'iwd?' field.
From: |
guix-commits |
Subject: |
06/18: services: connman: Deprecate 'iwd?' field. |
Date: |
Fri, 10 Mar 2023 11:41:43 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 17c80118fa2a78a249f7fb992ffa3e31407a24a7
Author: Bruno Victal <mirai@makinata.eu>
AuthorDate: Tue Mar 7 12:44:02 2023 +0000
services: connman: Deprecate 'iwd?' field.
* gnu/services/networking.scm (<connman-configuration>)
[iwd?]: Use helper to warn deprecated field.
(connman-shepherd-service): Make iwd? a local variable independent from
the deprecated field.
* doc/guix.texi (Networking Setup): Remove mention of iwd? field.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
doc/guix.texi | 2 --
gnu/services/networking.scm | 50 +++++++++++++++++++++++++--------------------
2 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index ece0c0354d..b098e45a50 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19926,8 +19926,6 @@ networks.
@item @code{disable-vpn?} (default: @code{#f})
When true, disable connman's vpn plugin.
-@item @code{iwd?} (default: @code{#f})
-When true, ConnMan uses iwd to connect to wireless networks.
@end table
@end deftp
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 6a09f6e728..0ed467f9d8 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1294,7 +1294,8 @@ wireless networking."))))
(disable-vpn? connman-configuration-disable-vpn?
(default #f))
(iwd? connman-configuration-iwd?
- (default #f)))
+ (default #f)
+ (sanitize warn-iwd?-field-deprecation)))
(define (connman-activation config)
(let ((disable-vpn? (connman-configuration-disable-vpn? config)))
@@ -1308,27 +1309,32 @@ wireless networking."))))
(define (connman-shepherd-service config)
(match-record config <connman-configuration> (connman shepherd-requirement
disable-vpn? iwd?)
- (list (shepherd-service
- (documentation "Run Connman")
- (provision '(networking))
- (requirement `(user-processes dbus-system loopback
- ,@shepherd-requirement
- ,@(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))))))
+ (let ((iwd? (or iwd? ; TODO: deprecated field, remove later.
+ (and shepherd-requirement
+ (memq 'iwd shepherd-requirement)))))
+ (list (shepherd-service
+ (documentation "Run Connman")
+ (provision '(networking))
+ (requirement `(user-processes dbus-system loopback
+ ,@shepherd-requirement
+ ;; TODO: iwd? is deprecated and
should be passed
+ ;; with shepherd-requirement,
remove later.
+ ,@(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, 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 <=
- 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
- 13/18: import: Add EUPL 1.1 to the SPDX license name converter., guix-commits, 2023/03/10
- 14/18: gnu: r-mapproj: Correct license field to lpl1.02., guix-commits, 2023/03/10
- 16/18: gnu: Add 9yacc., guix-commits, 2023/03/10
- 15/18: gnu: Add lib9., guix-commits, 2023/03/10
- 17/18: gnu: Add 9base., guix-commits, 2023/03/10
- 18/18: doc: Add missing space after @deftp., guix-commits, 2023/03/10