From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 yDjCHnPbDGRnuwAASxT56A (envelope-from ) for ; Sat, 11 Mar 2023 20:50:11 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OIy4HnPbDGTWygAA9RJhRA (envelope-from ) for ; Sat, 11 Mar 2023 20:50:11 +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 A3D5C2AE50 for ; Sat, 11 Mar 2023 20:50:10 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pb5EC-00049Y-A1; Sat, 11 Mar 2023 14:50:04 -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 1pb5EA-00049K-SI for guix-patches@gnu.org; Sat, 11 Mar 2023 14:50:02 -0500 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 1pb5EA-0006aE-B6 for guix-patches@gnu.org; Sat, 11 Mar 2023 14:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pb5E9-0006kA-TE for guix-patches@gnu.org; Sat, 11 Mar 2023 14:50:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62128] [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Mar 2023 19:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62128 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62128@debbugs.gnu.org Cc: ludo@gnu.org, mirai@makinata.eu, ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167856417825887 (code B ref -1); Sat, 11 Mar 2023 19:50:01 +0000 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 X-OVh-ClientIp: 81.67.140.142 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-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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via 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=none; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678564211; a=rsa-sha256; cv=none; b=TaFizD3fJqOgcQ5DcLtGy9dnprHQ/PF4gkuHyW0yHZAhby82BXPfhbPvK493wSDVPNxdh1 V6RVKOo+nEYb9Wx1a2iYusKTinrBpeXn9n590PdSVY/zn0AXlyhYn9qahpb0WgWfFnMFYO dkZ2dk0LFLfmGBMJYGBdj4iYdbqzgMsQllT6BMrUTeHWbag8iKxoJp53umFNN20xYweFZv XH7kFPoX8vS5VATN5lw03cErtev4xyeEkEaFF0R2HXAdD9UQYjXzi6mNwCrrnPy0arxlJp Ki4HIW6vyqFoay+2gS+ZmT+D2IiEdNG+vLOa58+5y8b8ajKKaQLw3xhs9z1fHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678564211; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BWgeLCHvHohCBXcrYJQcoi9tGhyYl3K6+gt9o3Jy2IM=; b=NZcJlZKGiSAT7f6naKx/6dKhKV0G1dY4wWnO7gOyVvYpxAtfga4T9AJolOCRuZRLk/U7Bf rK84gYqCcL9uWA5pGLqQWr3Kwg3r9iLLP/YdLCtWvKrOYt+Stwxul5l6ypPFQlWjPY9/pV kA26e7AgBnihROBQGnW7IPA37HyYsZRsJkDikjJ8m+XTVfqNWIk3RciSnN2lDeBitMQSpo D2d4SavYrdxpbW2+tJhKdv/Valet/k8WEgwHymrLAY9cZwLWlMCcyxWusUvx4YMxij0qrJ WQskTOhqN4AdQyYquoYQSL/gP54K3uwn0kPvsHXk07iTVOO219g3zQX+LcBHZQ== X-Migadu-Spam-Score: -3.40 X-Spam-Score: -3.40 X-Migadu-Queue-Id: A3D5C2AE50 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; 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=pass (policy=none) header.from=gnu.org X-TUID: 0RKqjAdkGYzK --- 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