* [bug#62128] [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement.
@ 2023-03-11 19:49 Nicolas Graves via Guix-patches via
2023-03-20 8:24 ` bug#62128: " Andrew Tropin
0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2023-03-11 19:49 UTC (permalink / raw)
To: 62128; +Cc: ludo, mirai, ngraves
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* bug#62128: [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement.
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
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Tropin @ 2023-03-20 8:24 UTC (permalink / raw)
To: guix-patches, 62128-done; +Cc: ludo, mirai, ngraves
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-20 8:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` bug#62128: " Andrew Tropin
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).