From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id uBwLFtIYGGRhkgAASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 09:26:58 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id mHoeFdIYGGRtkwAAG6o9tA (envelope-from ) for ; Mon, 20 Mar 2023 09:26:58 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 25DA82A8A for ; Mon, 20 Mar 2023 09:26:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peAqF-0007dQ-8g; Mon, 20 Mar 2023 04:26:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peAqA-0007cf-Ok for guix-patches@gnu.org; Mon, 20 Mar 2023 04:26:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peAqA-0002lB-GH for guix-patches@gnu.org; Mon, 20 Mar 2023 04:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peAqA-0001on-CO for guix-patches@gnu.org; Mon, 20 Mar 2023 04:26:02 -0400 Subject: bug#62128: [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 08:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 62128 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: guix-patches@gnu.org, 62128-done@debbugs.gnu.org Cc: ludo@gnu.org, mirai@makinata.eu, ngraves@ngraves.fr Mail-Followup-To: 62128@debbugs.gnu.org, andrew@trop.in, ngraves@ngraves.fr Received: via spool by 62128-done@debbugs.gnu.org id=D62128.16793007056887 (code D ref 62128); Mon, 20 Mar 2023 08:26:02 +0000 Received: (at 62128-done) by debbugs.gnu.org; 20 Mar 2023 08:25:05 +0000 Received: from localhost ([127.0.0.1]:53610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peApE-0001n1-Se for submit@debbugs.gnu.org; Mon, 20 Mar 2023 04:25:05 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:34871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peApD-0001mQ-2O for 62128-done@debbugs.gnu.org; Mon, 20 Mar 2023 04:25:03 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 762D024000F; Mon, 20 Mar 2023 08:24:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1679300697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wbN4GgUP/hZiC0Qo7Zq8499s3fAko+uCOt/trQFUkEo=; b=eoU6qQZNFmxpcYxSx+BIKoHMFj2fBTuamDlRwp1TIJt9+D7qYD6XZ91kJFA7LOGPXlg415 zWse9r2vkmDxdraj+2BtgaAq4isLbuz0P/q2n+kQ5NpN4nHS2d1HcsjOA8KGiepCDMfsZr fGShz+Dq3k/xViFwlr6XRNYctJtO/Ky8qGM9G+CWp90nLDgoejvXyva8yMybJclmzy9MhZ nTUztQE1SQxSv811Qia488hlcdNbGvmqir6YdmwwD94xm0CcW6cqNtE17ciAFx+oh687Gj wRQbKcPk9Ibe8fAAwgNaTS3gT8JbCQoGNxB8HGNnET5n4x2FUfI7pvkHl+nOng== From: Andrew Tropin In-Reply-To: <20230311194913.3073-1-ngraves@ngraves.fr> References: <20230311194913.3073-1-ngraves@ngraves.fr> Date: Mon, 20 Mar 2023 12:24:49 +0400 Message-ID: <87r0tjhlta.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=eoU6qQZN; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679300818; a=rsa-sha256; cv=none; b=fagX7Ti9y/cejx6WZPZ7CAiSyzaGdPOseYj0P/zjJyIQ9slDiUcLz2DcqxhR35rz5C0iMN 7p+s2/ROfwU8D6ESVWAbeSzSBS1HWSS51wbvVOBRCCQUKuF36kIbNVrINjsj2JDecWgY6Q m7Ik2iNPo0Yu8RipFb/iT/6z3e7HKurL3GP+mFjkX0Pt8aOL6o94VI2PJ3PiiUOnAOikbE KATcMNpM2LVN6gXHKFZnsGnGd4X0DuRRTEZZ6pN61iWFAJ9nKvO3CheMMwQJp/YF7Pve81 4nmLaHhdEfTaMjbjuuGA+eRSlAcTUO2oGjwxJQNrWuRRCnc6QUHGfN5l4jTBgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679300818; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=wbN4GgUP/hZiC0Qo7Zq8499s3fAko+uCOt/trQFUkEo=; b=Wue5OGeuhx8HG6CrV/yy8bEMB4VwzAlwAxGTm3cpCKtHTYihq7gYeGM4ziko96H5iXChMI pNQpuBAT/e6Ev5nxmk/voY9anXMBPIVxyTV5LKn3ArXD/R1QnVH53mf9UKwp/sWAk0OhWR +CSwumS8nbbhq5kplaZhXXDhyYhyLqkTYoPzLJji0Jd0buOPp7hEVWEXH3CJA3waQSPsZG oKPyMnFMynyz0//nHM/0gjFJKsUaSsmCarh0cnnYA0M5RZ7xUafgSPZEfCwZwDan/6DJ6u MOh/NcknJ//Kp4EJEaMo/umF5bA6qBdE3M+isdS5ieiEpA8Ojv23mdfTAUzrIQ== X-Migadu-Spam-Score: -3.95 X-Spam-Score: -3.95 X-Migadu-Queue-Id: 25DA82A8A X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=eoU6qQZN; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-TUID: SB9pwwqdzpYS --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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 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=3D" dns "\n" > - (if iwd? "[device]\nwifi.backend=3Diwd\n" "= ")))) > + (if (or iwd? ; TODO: deprecated, remove lat= er. > + (and shepherd-requirement > + (memq 'iwd shepherd-requirem= ent))) > + "[device]\nwifi.backend=3Diwd\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:=20 https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D3a2200e1ad =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----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----- --=-=-=--