[PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement.

  • Done
  • quality assurance status badge
Details
2 participants
  • Andrew Tropin
  • Nicolas Graves
Owner
unassigned
Submitted by
Nicolas Graves
Severity
normal
N
N
Nicolas Graves wrote on 11 Mar 2023 20:49
(address . guix-patches@gnu.org)
20230311194913.3073-1-ngraves@ngraves.fr
---
gnu/services/networking.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

Toggle diff (25 lines)
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
A
A
Andrew Tropin wrote on 20 Mar 2023 09:24
87r0tjhlta.fsf@trop.in
On 2023-03-11 20:49, Nicolas Graves via Guix-patches via wrote:

Toggle quote (28 lines)
> ---
> 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:

--
Best regards,
Andrew Tropin
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmQYGFEACgkQIgjSCVjB
3rB3wQ//T5vosTCsXR3giUyBMddpqh+SF5cXgTJvaLjNka/zyjruGlrF2OtAw4Ur
zzg3pnCOUCYZ3BOjpASx2xUasxlyHrG9Cry2RY/tjZ8aybdJyfa162lbczWtdXiP
QdG++Ux0JaqkRIlVTG9VXgGrkYGl1I1I70sFoPpWuKa/IIxVpxxCMWkB3ycq3WYx
dgIfeUG0aaLV1umbl8ShXMzi4axPvd5M5ISssJ29fze571w2wo1MY55VBENqeiVf
ZohEj2y0WHqig1Gi9RNFO/ll0xJHHq/28iLOO0bREKO6a7UQ3cjS2L4NV+ollJ0m
jC+6YVyiHchKwJMEcWjcGxG8nXTtWihGZAtqhZT+6GAwxn2XS8JLTzu7jOYvzX4U
21V2OXMwIEl788k28mWIc7wr/zC+2HWjy8+WmGbEUo3NLF/5TySj344xfqYiCw/l
4PtC5l0kGLFgX0Dau+tja6uUyZbA+d7qpwZdoNemAEI8WWGo+GQl7Cik4QguE45I
TfOvBWCky/lgR0MpkvPZ/MS9PJ3u7uEeHGDr+m3vtsqcZkQlIyObJh3WO0BEGTm0
iLgsDei1b5MSRfRQ8sKk9gcUIm79TEV97zecdWRnAX3p2mNCXzsI0LRZTQeozzka
0XBQBJQhlerxXPuyAyVx/VdTrt0SQwXB03xCKFygz7dyggy6uSk=
=UqqI
-----END PGP SIGNATURE-----

?