[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#62128: [PATCH] services: network-manager: Avoid doubling iwd shepher
From: |
Andrew Tropin |
Subject: |
bug#62128: [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement. |
Date: |
Mon, 20 Mar 2023 12:24:49 +0400 |
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
Description: PGP signature