GNU bug report logs - #62128
[PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement.

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Cc: ludo <at> gnu.org, mirai <at> makinata.eu, ngraves <at> ngraves.fr
Subject: [PATCH] services: network-manager: Avoid doubling iwd
 shepherd-requirement.
Date: Sat, 11 Mar 2023 20:49:13 +0100

---
 gnu/services/networking.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 5c6ad4ce3b..b656f3c938 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1219,13 +1219,13 @@ (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 ((iwd? (or iwd?  ; TODO: deprecated field, remove later.
-                    (and shepherd-requirement
-                         (memq 'iwd shepherd-requirement))))
-          (conf (plain-file "NetworkManager.conf"
+    (let ((conf (plain-file "NetworkManager.conf"
                             (string-append
                              "[main]\ndns=" dns "\n"
-                             (if iwd? "[device]\nwifi.backend=iwd\n" ""))))
+                             (if (or iwd? ; TODO: deprecated, remove later.
+                                     (and shepherd-requirement
+                                            (memq 'iwd shepherd-requirement)))
+                              "[device]\nwifi.backend=iwd\n" ""))))
           (vpn  (vpn-plugin-directory vpn-plugins)))
       (list (shepherd-service
              (documentation "Run the NetworkManager.")
-- 
2.39.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.