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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 62128 in the body.
You can then email your comments to 62128 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

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

From: Andrew Tropin <andrew <at> trop.in>
To: guix-patches <at> gnu.org, 62128-done <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, mirai <at> makinata.eu, ngraves <at> ngraves.fr
Subject: Re: [bug#62128] [PATCH] services: network-manager: Avoid doubling
 iwd shepherd-requirement.
Date: Mon, 20 Mar 2023 12:24:49 +0400

[Message part 1 (text/plain, inline)]

On 2023-03-11 20:49, Nicolas Graves via Guix-patches via wrote:

> ---
>  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.")

The shadowing for iwd? in let was missing, should be fixed by: 
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3a2200e1ad

-- 
Best regards,
Andrew Tropin

[signature.asc (application/pgp-signature, inline)]

Previous Next

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