From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id qIyPIhp8AmRpIQEAbAwnHQ (envelope-from ) for ; Sat, 04 Mar 2023 00:00:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id WIyzIRp8AmT/CgAAG6o9tA (envelope-from ) for ; Sat, 04 Mar 2023 00:00:42 +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 578B4213EE for ; Sat, 4 Mar 2023 00:00:42 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYENi-0000tv-F1; Fri, 03 Mar 2023 18:00:06 -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 1pYENg-0000rJ-Ap for guix-patches@gnu.org; Fri, 03 Mar 2023 18:00:04 -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 1pYENf-0007JU-8W for guix-patches@gnu.org; Fri, 03 Mar 2023 18:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYENf-0000xr-4l for guix-patches@gnu.org; Fri, 03 Mar 2023 18:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61587] [PATCH v2 1/8] services: network-manager: Add 'shepherd-requirement' field. References: In-Reply-To: Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Mar 2023 23:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61587 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61587@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61587-submit@debbugs.gnu.org id=B61587.16778843923597 (code B ref 61587); Fri, 03 Mar 2023 23:00:03 +0000 Received: (at 61587) by debbugs.gnu.org; 3 Mar 2023 22:59:52 +0000 Received: from localhost ([127.0.0.1]:34135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYENU-0000vw-A1 for submit@debbugs.gnu.org; Fri, 03 Mar 2023 17:59:52 -0500 Received: from smtpm3.myservices.hosting ([185.26.105.234]:47148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYENS-0000vV-P1 for 61587@debbugs.gnu.org; Fri, 03 Mar 2023 17:59:51 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 5C2542105E for <61587@debbugs.gnu.org>; Fri, 3 Mar 2023 23:59:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 013AF80098; Fri, 3 Mar 2023 23:59:46 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id bAX97-EFX6yc; Fri, 3 Mar 2023 23:59:45 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 83E9B80079; Fri, 3 Mar 2023 23:59:45 +0100 (CET) From: Bruno Victal Date: Fri, 3 Mar 2023 22:59:06 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Seal: i=1; s=key1; d=yhetil.org; t=1677884442; a=rsa-sha256; cv=none; b=KBxK1uK9f+icLN20XZkv/z/VbRY8CIzLBbdlOX7zeWyj7KU89cY5Rmw6s5veGpnnZkLz10 kYfw/uyBmcOeL5XmF1b4UlYx86xRZGrnxCJExWy+z2/G/kaXS7z2+K+H/W6CkJyfu3yL/o fsrtmQA9brTKkr0qjaoRLW3Zp4Bw93QVgpdxyaDaGm5BIjlL7+hmDVUkn6e/VlGRMhhucg 1t05tLHdgYVO+bUgukPTaGu73ActEnXuUZp0ain6K19ndCsD4M4rvr6dESW2SBexkzXH2Q bjzOdMsUwpqf/T1Hjj+/KZrpFykYz8XSOGWEAYeErokdOj0FVS3eXmjeQpnfzg== 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677884442; h=from:from:sender:sender: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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Eh+EctfgceR8hO3gV2EBufRdXyo+RhY+Q9JSJaEMTsk=; b=eDoip2begoDlAvwCAYW8coJ7UonTPy79O7rSrTF/Iu8zjyTs2TW2hh7TTpD9+4ho9ItDz5 lKzGV6+GQ/VYss7yOqCk3MLHZ5tKit6xcUuWk5z/m01jl3CA9+6BCIuEpFuiPca6zOoJ6w BAc4oaxbr4lO97qi5hluNP1gMvUOzBzhfwcGJu0niOpTQ61vPo9oZx3l5/8dvHvUG7ZR2h +nmRo6TBuUGmhu0W/eLPhJSxUnnXQ/p+fy74fbL5LrPx2O0GgtCGq3fSPl3rzsWx/wzaUb XYoikFgJVHMsoCfr6u0zAvgRK77m9Hor+PQeFCHuCShF6THf7I2HvsP+8WkqJQ== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.20 X-Spam-Score: -0.20 X-Migadu-Queue-Id: 578B4213EE 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=none X-TUID: 2EgJ46U39i4l Note: This also makes wpa-supplicant an optional requirement. * gnu/services/networking.scm () [shepherd-requirement]: New field. (network-manager-shepherd-service): Honor it. (network-manager-configuration-shepherd-requirement): Export accessor. * doc/guix.texi (Networking Setup): Document it. --- doc/guix.texi | 6 ++++++ gnu/services/networking.scm | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 74658dbc86..4599c87a72 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19836,6 +19836,12 @@ Networking Setup @item @code{network-manager} (default: @code{network-manager}) The NetworkManager package to use. +@item @code{shepherd-requirement} (default: @code{()}) +This option can be used to provide a list of symbols naming Shepherd services +that this service will depend on, such as @code{'wpa-supplicant} or +@code{'iwd} if you require authenticated access for encrypted WiFi or Ethernet +networks. + @item @code{dns} (default: @code{"default"}) Processing mode for DNS, which affects how NetworkManager uses the @code{resolv.conf} configuration file. diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index dacf64c2d1..5284855b83 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -143,6 +143,7 @@ (define-module (gnu services networking) network-manager-configuration network-manager-configuration? + network-manager-configuration-shepherd-requirement network-manager-configuration-dns network-manager-configuration-vpn-plugins network-manager-service-type @@ -1140,6 +1141,8 @@ (define-record-type* network-manager-configuration? (network-manager network-manager-configuration-network-manager (default network-manager)) + (shepherd-requirement network-manager-configuration-shepherd-requirement + (default '())) (dns network-manager-configuration-dns (default "default")) (vpn-plugins network-manager-configuration-vpn-plugins ;list of file-like @@ -1200,7 +1203,7 @@ (define (network-manager-environment config) (define (network-manager-shepherd-service config) (match-record config - (network-manager dns vpn-plugins iwd?) + (network-manager shepherd-requirement dns vpn-plugins iwd?) (let ((conf (plain-file "NetworkManager.conf" (string-append "[main]\ndns=" dns "\n" @@ -1209,8 +1212,9 @@ (define (network-manager-shepherd-service config) (list (shepherd-service (documentation "Run the NetworkManager.") (provision '(networking)) - (requirement (append '(user-processes dbus-system loopback) - (if iwd? '(iwd) '(wpa-supplicant)))) + (requirement `(user-processes dbus-system loopback + ,@shepherd-requirement + ,@(if iwd? '(iwd) '()))) (start #~(make-forkexec-constructor (list (string-append #$network-manager "/sbin/NetworkManager") base-commit: 6a1464b0cc8c0b3e53d2580661a8c69d79f183ab -- 2.39.1