From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 11 14:49:38 2023 Received: (at submit) by debbugs.gnu.org; 11 Mar 2023 19:49:38 +0000 Received: from localhost ([127.0.0.1]:58719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pb5Dm-0006jS-BU for submit@debbugs.gnu.org; Sat, 11 Mar 2023 14:49:38 -0500 Received: from lists.gnu.org ([209.51.188.17]:36542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pb5Dk-0006jI-CJ for submit@debbugs.gnu.org; Sat, 11 Mar 2023 14:49:36 -0500 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 1pb5Dk-00044P-2u for guix-patches@gnu.org; Sat, 11 Mar 2023 14:49:36 -0500 Received: from 4.mo575.mail-out.ovh.net ([46.105.59.63]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pb5Di-0006Yy-JO for guix-patches@gnu.org; Sat, 11 Mar 2023 14:49:35 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.1.219]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 7AF6924149 for ; Sat, 11 Mar 2023 19:49:22 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-cn5mk (unknown [10.110.171.46]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 986611FDFC; Sat, 11 Mar 2023 19:49:20 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-cn5mk with ESMTPSA id dCtFKEDbDGTe7DEAf8Xb4g (envelope-from ); Sat, 11 Mar 2023 19:49:20 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0032ea82213-248c-421e-b1ef-2295ff5b50c2, 682BE5F0E0E7CEA554DEA0B20AE4EB25CD822E0F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement. Date: Sat, 11 Mar 2023 20:49:13 +0100 Message-Id: <20230311194913.3073-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 15799190443674559197 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvddvtddguddtgecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeehpdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=46.105.59.63; envelope-from=ngraves@ngraves.fr; helo=4.mo575.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: ludo@gnu.org, mirai@makinata.eu, ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --- 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=" 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 20 04:25:10 2023 Received: (at submit) by debbugs.gnu.org; 20 Mar 2023 08:25:10 +0000 Received: from localhost ([127.0.0.1]:53613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peApK-0001nM-9L for submit@debbugs.gnu.org; Mon, 20 Mar 2023 04:25:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:47086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peApF-0001n8-JB for submit@debbugs.gnu.org; Mon, 20 Mar 2023 04:25:06 -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 1peApF-0007YO-2Z for guix-patches@gnu.org; Mon, 20 Mar 2023 04:25:05 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peApB-0001Pa-BL; 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 To: guix-patches@gnu.org, 62128-done@debbugs.gnu.org Subject: Re: [bug#62128] [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement. 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" Received-SPF: pass client-ip=217.70.183.193; envelope-from=andrew@trop.in; helo=relay1-d.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit Cc: ludo@gnu.org, mirai@makinata.eu, ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) --=-=-= 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----- --=-=-=-- From unknown Sat Jun 21 03:21:14 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 17 Apr 2023 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator