From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id wEcyG9PES2X13wAAauVa8A:P1 (envelope-from ) for ; Wed, 08 Nov 2023 18:26:43 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wEcyG9PES2X13wAAauVa8A (envelope-from ) for ; Wed, 08 Nov 2023 18:26:43 +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 4BFDE5A74D for ; Wed, 8 Nov 2023 18:26:43 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699464403; a=rsa-sha256; cv=none; b=f5DNJ/yCP9tYqhlzieUOoNlfgM/h8LQ6I1r3Eidvr/9Vvva3lYozZXMHzbkKYAt+XtVyhp cyAy8mIOzk4PN0nogW4cvUjNNLS9BoKeXh+IvYxnbPns8jPhVsnCOes7ZhtLrKt/fApRXu 9Yced/2GnT2nSIu/nAAZq6yWy6Y25PnazhBzIW3Ec69sBGIeHrKBxw+gVr4n+3EbTTJkjA 4PUUAs9c9Q3DEG6cqOLy1+QPTmDcBV8TeaE3Qy3UHuvoLzo0hajT5un8j40XkkxuvV/gg1 tvgKwYkly9lo3UoMwawaQZyJbk/LYOQkZQrFxTeXxvbhntohHQSmCpR9sgmK9w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699464403; 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=dq6348wetIC8FLIQFEHqa3fVVaERw0I5r3zSRBCMR58=; b=sJ6o9+bIpMyxYVYHxCSSzJ96QpJkiU8l1EQNIwy2zNSEm/Y+qRNHSFw1u7FNAtJgh5fFs1 DNT0bqRKKupBq14XysZUQeNH6J4tb3qBfd6/9Ns1B1Y+dfmErFaWaQjxU8Ob7Tbv9zHPD+ kepAyUQ1Hl4DmpfWRU2RRXqNpjZFm/KkIGoj+eybvZYiTQzNT5WFRfGCQlclHUQgh5F6Ok 3rTWdLqbT0yXqTG1kecS653ujMtmdFLoGY7cBwHmNGuOi4EVLvEb1EybYzOVOOX/rMQXYh xJSf1ag04h7aIzVASlwurKnulufYmXz9RT6Yg4zUF1W7rCYRb67pzIlzvaWu3g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0mJu-0001mW-L6; Wed, 08 Nov 2023 12:26:27 -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 1r0mJs-0001lw-Iq for guix-patches@gnu.org; Wed, 08 Nov 2023 12:26:24 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0mJs-0006kV-2M for guix-patches@gnu.org; Wed, 08 Nov 2023 12:26:24 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0mKU-0007Ic-MX for guix-patches@gnu.org; Wed, 08 Nov 2023 12:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66887] [PATCH v2 2/3] gnu: podman: Use catatonit. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Nov 2023 17:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66887 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66887@debbugs.gnu.org Cc: Wilke Schwiedop Received: via spool by 66887-submit@debbugs.gnu.org id=B66887.169946438828002 (code B ref 66887); Wed, 08 Nov 2023 17:27:02 +0000 Received: (at 66887) by debbugs.gnu.org; 8 Nov 2023 17:26:28 +0000 Received: from localhost ([127.0.0.1]:46239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0mJv-0007HU-TZ for submit@debbugs.gnu.org; Wed, 08 Nov 2023 12:26:28 -0500 Received: from minsky.hcoop.net ([104.248.1.95]:51984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0mJu-0007H2-1s for 66887@debbugs.gnu.org; Wed, 08 Nov 2023 12:26:26 -0500 Received: from [2603:6080:a200:1c76::19a] (helo=mimolette.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r0mJC-0003MC-68; Wed, 08 Nov 2023 12:25:42 -0500 From: Jack Hill Date: Wed, 8 Nov 2023 12:24:56 -0500 Message-ID: <4ca22003bd312ce469ecd843e8101402f9cf4177.1699464297.git.jackhill@jackhill.us> X-Mailer: git-send-email 2.41.0 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: 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-Migadu-Queue-Id: 4BFDE5A74D X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.61 X-Spam-Score: -4.61 X-TUID: zCxwl6uEeGE9 From: Wilke Schwiedop defaultHelperBinariesDir is a string array of paths searched by the FindHelperBinary function. This patch inserts new entries at the beginning of array instead of modifying individual elements. This will make it easier to include additional helper binaries, e.g. aardvark, netavark and pasta. Change-Id: I2f988b9225f3fcee7f00c48ba3aedc9289ba9d47 --- gnu/packages/containers.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index e26b5acf21..c00394af2b 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -381,22 +381,31 @@ (define-public podman (("CATATONIT_PATH=\"[^\"]+\"") (string-append "CATATONIT_PATH=" (which "true")))) (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go" - (("/usr/local/libexec/podman") - (string-append #$output "/libexec/podman")) - (("/usr/local/lib/podman") - (string-append #$output "/bin"))) + (("var defaultHelperBinariesDir = ..string." all) + (string-append + all + (string-join + (map (lambda (s) (string-append "\n\"" s "\",")) + (list + (string-append #$output "/libexec/podman") + (string-append #$output "/bin") + (string-append #$(this-package-input "catatonit") "/bin"))))))) (substitute* "vendor/github.com/containers/common/pkg/config/default.go" (("/usr/libexec/podman/conmon") (which "conmon")) (("/usr/local/libexec/cni") (string-append #$(this-package-input "cni-plugins") "/bin")) - (("/usr/bin/crun") (which "crun"))))) + (("/usr/bin/crun") (which "crun")) + (("/usr/libexec/podman/catatonit") (which "catatonit"))) + (substitute* "pkg/rootless/rootless_linux.c" + (("/usr/bin/catatonit") (which "catatonit"))))) (add-after 'install 'install-completions (lambda _ (invoke "make" "install.completions" (string-append "PREFIX=" #$output))))))) (inputs (list btrfs-progs + catatonit cni-plugins conmon crun -- 2.41.0