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: Bruno Victal <mirai@makinata.eu>
Subject: [bug#61587] [PATCH 2/8] services: network-manager: Deprecate 'iwd?' field.
Date: Fri, 17 Feb 2023 21:14:53 +0000	[thread overview]
Message-ID: <a7bf9144218fb8679a0fed008eaaf1488c933673.1676667941.git.mirai@makinata.eu> (raw)
In-Reply-To: <cover.1676667941.git.mirai@makinata.eu>

* gnu/services/networking.scm (warn-iwd?-field-deprecation): New procedure,
helper for deprecated field.
(<network-manager-configuration>)[iwd?]: Use helper to warn deprecated field.
(network-manager-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               |  4 ----
 gnu/services/networking.scm | 20 ++++++++++++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 46e0f637d0..8ccd727e6e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19758,10 +19758,6 @@ Networking Setup
 (VPNs).  An example of this is the @code{network-manager-openvpn}
 package, which allows NetworkManager to manage VPNs @i{via} OpenVPN.
 
-@item @code{iwd?} (default: @code{#f})
-NetworkManager will use iwd as a backend for wireless networking if this
-option is set to @code{#t}, otherwise it will use wpa-supplicant.
-
 @end table
 @end deftp
 
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 5284855b83..ddf2e20791 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1136,6 +1136,15 @@ (define-record-type* <modem-manager-configuration>
 ;;; NetworkManager
 ;;;
 
+;; TODO: deprecated field, remove later.
+(define-with-syntax-properties (warn-iwd?-field-deprecation
+                                (value properties))
+  (when value
+    (warning (source-properties->location properties)
+             (G_ "the 'iwd?' field is deprecated, please use \
+'shepherd-requirement' field instead~%")))
+  value)
+
 (define-record-type* <network-manager-configuration>
   network-manager-configuration make-network-manager-configuration
   network-manager-configuration?
@@ -1147,7 +1156,9 @@ (define-record-type* <network-manager-configuration>
        (default "default"))
   (vpn-plugins network-manager-configuration-vpn-plugins ;list of file-like
                (default '()))
-  (iwd? network-manager-configuration-iwd? (default #f)))
+  (iwd? network-manager-configuration-iwd?  ; TODO: deprecated field, remove.
+        (default #f)
+        (sanitize warn-iwd?-field-deprecation)))
 
 (define (network-manager-activation config)
   ;; Activation gexp for NetworkManager
@@ -1204,7 +1215,10 @@ (define (network-manager-environment config)
 (define (network-manager-shepherd-service config)
   (match-record config <network-manager-configuration>
     (network-manager shepherd-requirement dns vpn-plugins iwd?)
-    (let ((conf (plain-file "NetworkManager.conf"
+    (let ((iwd? (or iwd?  ; TODO: deprecated field, remove later.
+                    (and shepherd-requirement
+                         (memq 'iwd shepherd-requirement))))
+          (conf (plain-file "NetworkManager.conf"
                             (string-append
                              "[main]\ndns=" dns "\n"
                              (if iwd? "[device]\nwifi.backend=iwd\n" ""))))
@@ -1214,6 +1228,8 @@ (define (network-manager-shepherd-service config)
              (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 #$network-manager
-- 
2.39.1





  parent reply	other threads:[~2023-02-17 21:16 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 ` Bruno Victal [this message]
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   ` [bug#61587] [PATCH v3 5/8] services: connman: Deprecate 'iwd?' field Bruno Victal
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=a7bf9144218fb8679a0fed008eaaf1488c933673.1676667941.git.mirai@makinata.eu \
    --to=mirai@makinata.eu \
    --cc=61587@debbugs.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.