From: Andrew Tropin <andrew@trop.in>
To: guix-patches@gnu.org, 62128-done@debbugs.gnu.org
Cc: ludo@gnu.org, mirai@makinata.eu, ngraves@ngraves.fr
Subject: bug#62128: [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement.
Date: Mon, 20 Mar 2023 12:24:49 +0400 [thread overview]
Message-ID: <87r0tjhlta.fsf@trop.in> (raw)
In-Reply-To: <20230311194913.3073-1-ngraves@ngraves.fr>
[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
prev parent reply other threads:[~2023-03-20 8:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-11 19:49 [bug#62128] [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement Nicolas Graves via Guix-patches via
2023-03-20 8:24 ` Andrew Tropin [this message]
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r0tjhlta.fsf@trop.in \
--to=andrew@trop.in \
--cc=62128-done@debbugs.gnu.org \
--cc=guix-patches@gnu.org \
--cc=ludo@gnu.org \
--cc=mirai@makinata.eu \
--cc=ngraves@ngraves.fr \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).