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 ms5.migadu.com with LMTPS id YJ5aAVZ2aWKmcwEAbAwnHQ (envelope-from ) for ; Wed, 27 Apr 2022 18:59:02 +0200 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 eDiUAVZ2aWJuGAEA9RJhRA (envelope-from ) for ; Wed, 27 Apr 2022 18:59:02 +0200 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 96AA7AC5F for ; Wed, 27 Apr 2022 18:59:01 +0200 (CEST) Received: from localhost ([::1]:57296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njl0G-0005wQ-Ob for larch@yhetil.org; Wed, 27 Apr 2022 12:59:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njkzN-0004Po-Do for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50270) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njkzN-0005CN-2e for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1njkzN-0003ts-2L for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54997] [PATCH v2 10/15] services: ipfs: Adjust for Shepherd 0.9. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Apr 2022 16:58:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54997@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 54997-submit@debbugs.gnu.org id=B54997.165107864614824 (code B ref 54997); Wed, 27 Apr 2022 16:58:05 +0000 Received: (at 54997) by debbugs.gnu.org; 27 Apr 2022 16:57:26 +0000 Received: from localhost ([127.0.0.1]:44141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njkyk-0003qw-Ab for submit@debbugs.gnu.org; Wed, 27 Apr 2022 12:57:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njkyM-0003oD-8v for 54997@debbugs.gnu.org; Wed, 27 Apr 2022 12:57:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njkyE-00053W-Vp; Wed, 27 Apr 2022 12:56:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=0pgjMwjdOy4O50Emcy/6rmMMZOHshbrFdP+RNSSj450=; b=J7defC/RnJK9+MCWWfk5 sr0VlAG+oi36Tc2ana5dnGNclzYc3gUf+1RAhEo+eBrpIgzlQeCsAgmb6so+Q1lUCqj7W68jrCBU4 OnoLBvWK/fgkNkjEg8Peo8qdWxgT6IjveUms9JK+C6Q//+BbZCiaEoK8kXYgreLOKYeGvrEi8YKZk z6zaFbz7tyOXgcGU8/9bzRpqcinUHJSgBLF2qYHrrIOHLYKxF1P3zWs5Oc4fyY55GSxko/7uWbH3h 8ghEM4XFEawsq3k40KnXQwKbdQ97uIbHXXx2GjG5n7yHGVDvzPZW/qqsWlkF0eO76zkUmW3o8drwb fDBpPs9ZSGFzug==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:64439 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njkyE-0000Hl-FY; Wed, 27 Apr 2022 12:56:54 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 27 Apr 2022 18:56:30 +0200 Message-Id: <20220427165635.8015-11-ludo@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220427165635.8015-1-ludo@gnu.org> References: <878rrrk1v1.fsf_-_@gnu.org> <20220427165635.8015-1-ludo@gnu.org> 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651078741; 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:dkim-signature; bh=0pgjMwjdOy4O50Emcy/6rmMMZOHshbrFdP+RNSSj450=; b=RHdoUvjPQnCutvpNpuE2f1DqAQ/dx2iwVpjSXPuhbdpLfyCnAmWqwTuGeFmMTaLIABVn2o o4Cuxn5bfTW29OimRetN8Yvp48NLqaxdm0fAnpv7EsbLMLEKE7tUQxx0di6GaMAgQt42mr rTL3EcLUspKvzCLfSZIXUg1ehZVzupuw0moPrmBvVZliiLoZTHONXogloNtaKeNOTqcDWC sUQhppDFa2vXlNh6zLu842AyENuHnJgBXevv0/TQ2mqlBl8MO31Z8U6QOhy6w5zI33q+AI XMZTvma/U/ByAaN8VcuUKKghLEEsBQqCPs/pYkGf6AcNvJ/TxJ4stPkwWy2gFA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651078741; a=rsa-sha256; cv=none; b=HBnHr9sHRzPJF786bTaYr7f9qgo3f10feLnPE9J17VLsqpU/A5JzSQRbwfFRAkArT8pxCs +2phYhQvMvm5/vRhwGHgx4AebvoCboy2NMCtwHu29bo0gntvKLt9uK/pMV+tKAIs44mvjV zMUfO0ZL7VjaimUIZF8ELjzQ971ZXm1LC7n3rs/6EBgkGHkzh6FjASWRBRN5JX/Qc9BUMC 5M50rNXgITSmlIzOpJvKwgHEEr7fqKC/UqKechA8x6ga0kAxG0RboOyh/NiSJeg/g1melF ffnqO6aLo6Q/ad0ShXo7OQadMfbJ1B/bNUjPQajLZvT/U4c8w1GKYZoV6C2ZDQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="J7defC/R"; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -3.00 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="J7defC/R"; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: 96AA7AC5F X-Spam-Score: -3.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: hShq1rUl6hsl This is a followup to e1f0c88ea221d846b5a533c4dc88e99e953af63e. * gnu/services/networking.scm (%ipfs-activation)[shepherd&co]: New variable. [container-gexp]: Use it. --- gnu/services/networking.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 5bb8638930..b302be5aaf 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -2074,12 +2074,19 @@ (define inner-gexp #$@(map (cute apply set-config!-gexp <>) settings))) (define inner-script (program-file "ipfs-activation-inner" inner-gexp)) + + (define shepherd&co + ;; 'make-forkexec-constructor/container' needs version 0.9 for + ;; #:supplementary-groups. + (cons shepherd-0.9 + (list (lookup-package-input shepherd-0.9 "guile-fibers")))) + ;; Run ipfs init and ipfs config from a container, ;; in case the IPFS daemon was compromised at some point ;; and ~/.ipfs is now a symlink to somewhere outside ;; %ipfs-home. (define container-gexp - (with-extensions (list shepherd) + (with-extensions shepherd&co (with-imported-modules (source-module-closure '((gnu build shepherd) (gnu system file-systems))) -- 2.35.1