From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id eLY8IbTu72P91wAAbAwnHQ (envelope-from ) for ; Fri, 17 Feb 2023 22:16:36 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id ePxgILTu72MpbQAAG6o9tA (envelope-from ) for ; Fri, 17 Feb 2023 22:16:36 +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 48B533DB5B for ; Fri, 17 Feb 2023 22:16:36 +0100 (CET) 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676668596; a=rsa-sha256; cv=none; b=GdmrTs7xdyOhek+syS7i3s/kwSD5kcbuosM8vDZCHfokF36gKiGacQX30Y86Baql5UKfS/ XZelSeuDS/7crvkGbb1fmKiBEV5TRU/WaBRdMjTYPxFjvtpwT0vue2GsXMScE/VTEtDdZH 9irGaJ1iXivfxxR37mB1U9c6P7LqQXhyU/BxGP078Ct9TzRyTVYQABUkHl2HnUWLVL4ErT YhUflp9Pr/gXnT7y2098Kc6dv4zFYkpVA5PGb+JVoDc0Sqpz6wqZZcmp0ALyufE/Y4yKsV +gCuFVMNy6pnxIPCVYjMyf5My59N5m3EnHF4J7PgBpzwlTg8TAnNsM1yD1nZyQ== 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=1676668596; 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=1X5XXRma0qchGCDQ4O5CjrEzMMGzrYK2F7HhWn0He7M=; b=O4yF75vBEfr7Jp4reD/7Cxg5zrqIpmAfzJDcrjpeMmrVFCqTmNwRY+mImHcdtrjkt4m5Eh 1tEvlrDT5oOhInjZg5uM/OXK929xEBLTu18Zm5nvFMCJtDb1Cjyutc3Umifnw4Bqk42nTk CD6cvXyIPWyWU99JPy6i95pG9ytB3ymzoIPjU/AQ4+RsqMsU4D25kDWVwB3Ju3Pagsv11o KsgiHWqAfZ9EgNDywK/Blki/86+c8C1mfZuG9VWjzd5Tpv2HVzm5HYSn9PSEVKwyceDNjw /RJHrPew4siOvV42ho7F+NIHn+7aqIW4wueGZ1YjY+pt+Oep8HoUqAk7jIkn/g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT85T-0004VM-LJ; Fri, 17 Feb 2023 16:16:11 -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 1pT85L-0004UC-Ia for guix-patches@gnu.org; Fri, 17 Feb 2023 16:16:06 -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 1pT85L-0004Nf-4L for guix-patches@gnu.org; Fri, 17 Feb 2023 16:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT85K-00005X-WA for guix-patches@gnu.org; Fri, 17 Feb 2023 16:16:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61587] [PATCH 4/8] services: connman: Add 'shepherd-requirement' field. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 21:16:02 +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.167666854732756 (code B ref 61587); Fri, 17 Feb 2023 21:16:02 +0000 Received: (at 61587) by debbugs.gnu.org; 17 Feb 2023 21:15:47 +0000 Received: from localhost ([127.0.0.1]:41714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT855-0008WG-0V for submit@debbugs.gnu.org; Fri, 17 Feb 2023 16:15:47 -0500 Received: from smtpm5.myservices.hosting ([185.26.105.236]:60902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT853-0008W8-7W for 61587@debbugs.gnu.org; Fri, 17 Feb 2023 16:15:45 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id 7FCCD20CFC for <61587@debbugs.gnu.org>; Fri, 17 Feb 2023 22:15:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 24FD78009A; Fri, 17 Feb 2023 22:15:44 +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 AL6CHBV8QwRw; Fri, 17 Feb 2023 22:15:43 +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 B4E9D80098; Fri, 17 Feb 2023 22:15:43 +0100 (CET) From: Bruno Victal Date: Fri, 17 Feb 2023 21:14:55 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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: X-Migadu-Queue-Id: 48B533DB5B X-Spam-Score: -2.63 X-Migadu-Spam-Score: -2.63 X-Migadu-Scanner: scn0.migadu.com 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-Flow: FLOW_IN X-Migadu-Country: US X-TUID: 1X+7eg93b+rk * gnu/services/networking.scm () [shepherd-requirement]: New field. (connman-shepherd-service): Honor it. (connman-configuration-shepherd-requirement): Export accessor. * doc/guix.texi (Networking Setup): Document it. --- doc/guix.texi | 6 ++++++ gnu/services/networking.scm | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 8ccd727e6e..0a0080b117 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19785,6 +19785,12 @@ Networking Setup @item @code{connman} (default: @var{connman}) The connman 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{disable-vpn?} (default: @code{#f}) When true, disable connman's vpn plugin. diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 5cba3a9a3f..30a4d6a6d8 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -151,6 +151,7 @@ (define-module (gnu services networking) connman-configuration connman-configuration? connman-configuration-connman + connman-configuration-shepherd-requirement connman-configuration-disable-vpn? connman-configuration-iwd? connman-service-type @@ -1288,6 +1289,8 @@ (define-record-type* connman-configuration? (connman connman-configuration-connman (default connman)) + (shepherd-requirement connman-configuration-shepherd-requirement + (default '())) (disable-vpn? connman-configuration-disable-vpn? (default #f)) (iwd? connman-configuration-iwd? @@ -1303,13 +1306,14 @@ (define (connman-activation config) (mkdir-p "/var/lib/connman-vpn/")))))) (define (connman-shepherd-service config) - (match-record config (connman disable-vpn? iwd?) + (match-record config (connman shepherd-requirement + disable-vpn? iwd?) (list (shepherd-service (documentation "Run Connman") (provision '(networking)) - (requirement - (append '(user-processes dbus-system loopback) - (if iwd? '(iwd) '()))) + (requirement `(user-processes dbus-system loopback + ,@shepherd-requirement + ,@(if iwd? '(iwd) '()))) (start #~(make-forkexec-constructor (list (string-append #$connman "/sbin/connmand") -- 2.39.1