From patchwork Sun Apr 17 21:04:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 38641 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 09C7327BBEA; Sun, 17 Apr 2022 22:07:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 20B6127BBE9 for ; Sun, 17 Apr 2022 22:07:05 +0100 (BST) Received: from localhost ([::1]:41150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngC6o-0008GY-Co for patchwork@mira.cbaines.net; Sun, 17 Apr 2022 17:07:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ngC5t-0006J6-Oz for guix-patches@gnu.org; Sun, 17 Apr 2022 17:06:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ngC5s-0000YQ-U6 for guix-patches@gnu.org; Sun, 17 Apr 2022 17:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ngC5s-00026d-PH for guix-patches@gnu.org; Sun, 17 Apr 2022 17:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54997] [PATCH 08/12] 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: Sun, 17 Apr 2022 21:06:04 +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.16502295587993 (code B ref 54997); Sun, 17 Apr 2022 21:06:04 +0000 Received: (at 54997) by debbugs.gnu.org; 17 Apr 2022 21:05:58 +0000 Received: from localhost ([127.0.0.1]:37428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ngC5l-00024l-Qe for submit@debbugs.gnu.org; Sun, 17 Apr 2022 17:05:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ngC5b-00022Y-Oj for 54997@debbugs.gnu.org; Sun, 17 Apr 2022 17:05:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:58440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ngC5W-0000WA-2u; Sun, 17 Apr 2022 17:05:42 -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=NAyKD2hz8QqmjIzpOd4Q 9qt/haZ2S2AvWaXLHSknwIYgY/Z1A5LocSz27efCnVIThvXnsi9JCk0Rv+5x9OoDdai/bqEJcPpNK EUS/8vTaJW8Hhc/ao0aU6DaCIDEzdq9qHJJVVxDiZ57ju5RLGbjAzvEwdVjPi3VAJuCuzcO9ntYWK gbD20DmXyRl+E4ubmqGd2EJK2YaSOH2sbPQypK3fv1x9yWzUDUSlRWwfFk0DubBtGuyV1jpHhL7BJ +Y9OmTwv/NiAWPlawIOqrjT/TJFDoMl8/nbnC4cZWLj6pQH+jAN6dDoKbm75iytiyxjuywec1xn1j DmKA1g6t0IM3hw==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=38870 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 1ngC5V-000268-N0; Sun, 17 Apr 2022 17:05:41 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 17 Apr 2022 23:04:49 +0200 Message-Id: <20220417210453.27884-8-ludo@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417210453.27884-1-ludo@gnu.org> References: <20220417210453.27884-1-ludo@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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)))