[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#61587] [PATCH v3 2/8] services: network-manager: Deprecate 'iwd?' f
From: |
Bruno Victal |
Subject: |
[bug#61587] [PATCH v3 2/8] services: network-manager: Deprecate 'iwd?' field. |
Date: |
Tue, 7 Mar 2023 12:43:59 +0000 |
* 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 ed518cbcb8..ccaca0a71b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19890,10 +19890,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 4a3d5b887f..f572de1279 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
- [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 <=
- [bug#61587] [PATCH v3 4/8] services: connman: Add 'shepherd-requirement' field., Bruno Victal, 2023/03/07
- [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