all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Bruno Victal <mirai@makinata.eu>
To: 61587@debbugs.gnu.org
Cc: ludo@gnu.org, Bruno Victal <mirai@makinata.eu>
Subject: [bug#61587] [PATCH v3 5/8] services: connman: Deprecate 'iwd?' field.
Date: Tue,  7 Mar 2023 12:44:02 +0000	[thread overview]
Message-ID: <8f687a369c103cafa671284edcaecc9fa0b2766c.1678193024.git.mirai@makinata.eu> (raw)
In-Reply-To: <6d50c6d0cf8bc441bd9f38a0e2c02613b0a90d19.1678193024.git.mirai@makinata.eu>

* 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.
---
 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 @@ Networking Setup
 @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 @@ (define-record-type* <connman-configuration>
   (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 @@ (define (connman-activation config)
 (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
-- 
2.39.1





  parent reply	other threads:[~2023-03-07 12:50 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-17 21:12 [bug#61587] [PATCH 0/8] networking services refactoring Bruno Victal
2023-02-17 21:14 ` [bug#61587] [PATCH 1/8] services: network-manager: Add 'shepherd-requirement' field Bruno Victal
2023-02-17 21:14 ` [bug#61587] [PATCH 2/8] services: network-manager: Deprecate 'iwd?' field Bruno Victal
2023-02-17 21:14 ` [bug#61587] [PATCH 3/8] services: connman: Use match-record and export accessors Bruno Victal
2023-02-17 21:14 ` [bug#61587] [PATCH 4/8] services: connman: Add 'shepherd-requirement' field Bruno Victal
2023-02-17 21:14 ` [bug#61587] [PATCH 5/8] services: connman: Deprecate 'iwd?' field Bruno Victal
2023-02-17 21:14 ` [bug#61587] [PATCH 6/8] services: network-manager: Await for NetworkManager to finish starting up Bruno Victal
2023-03-03 17:13   ` [bug#61587] [PATCH 0/8] networking services refactoring Ludovic Courtès
2023-03-03 17:26     ` Bruno Victal
2023-02-17 21:14 ` [bug#61587] [PATCH 7/8] services: network-manager: Set service canonical-name to NetworkManager Bruno Victal
2023-03-03 17:15   ` [bug#61587] [PATCH 0/8] networking services refactoring Ludovic Courtès
2023-03-03 17:20     ` Bruno Victal
2023-03-06 15:20       ` Ludovic Courtès
2023-02-17 21:14 ` [bug#61587] [PATCH 8/8] services: connman: Set service canonical-name to connman Bruno Victal
2023-03-03 22:59 ` [bug#61587] [PATCH v2 1/8] services: network-manager: Add 'shepherd-requirement' field Bruno Victal
2023-03-03 22:59   ` [bug#61587] [PATCH v2 2/8] services: network-manager: Deprecate 'iwd?' field Bruno Victal
2023-03-03 22:59   ` [bug#61587] [PATCH v2 3/8] services: connman: Use match-record and export accessors Bruno Victal
2023-03-03 22:59   ` [bug#61587] [PATCH v2 4/8] services: connman: Add 'shepherd-requirement' field Bruno Victal
2023-03-03 22:59   ` [bug#61587] [PATCH v2 5/8] services: connman: Deprecate 'iwd?' field Bruno Victal
2023-03-03 22:59   ` [bug#61587] [PATCH v2 6/8] services: network-manager: Await for NetworkManager to finish starting up Bruno Victal
2023-03-03 22:59   ` [bug#61587] [PATCH v2 7/8] services: network-manager: Set service canonical-name to NetworkManager Bruno Victal
2023-03-03 22:59   ` [bug#61587] [PATCH v2 8/8] services: connman: Set service canonical-name to connman Bruno Victal
2023-03-07 10:01   ` [bug#61587] [PATCH 0/8] networking services refactoring Ludovic Courtès
2023-03-07 10:04     ` Ludovic Courtès
2023-03-07 12:43 ` [bug#61587] [PATCH v3 1/8] services: network-manager: Add 'shepherd-requirement' field Bruno Victal
2023-03-07 12:43   ` [bug#61587] [PATCH v3 2/8] services: network-manager: Deprecate 'iwd?' field Bruno Victal
2023-03-07 12:44   ` [bug#61587] [PATCH v3 3/8] services: connman: Use match-record and export accessors Bruno Victal
2023-03-07 12:44   ` [bug#61587] [PATCH v3 4/8] services: connman: Add 'shepherd-requirement' field Bruno Victal
2023-03-07 12:44   ` Bruno Victal [this message]
2023-03-07 12:44   ` [bug#61587] [PATCH v3 6/8] services: network-manager: Await for NetworkManager to finish starting up Bruno Victal
2023-03-07 12:44   ` [bug#61587] [PATCH v3 7/8] services: network-manager: Set service canonical-name to NetworkManager Bruno Victal
2023-03-07 12:44   ` [bug#61587] [PATCH v3 8/8] services: connman: Set service canonical-name to connman Bruno Victal
2023-03-10 13:21   ` bug#61587: [PATCH v3 1/8] services: network-manager: Add 'shepherd-requirement' field Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8f687a369c103cafa671284edcaecc9fa0b2766c.1678193024.git.mirai@makinata.eu \
    --to=mirai@makinata.eu \
    --cc=61587@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.