From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id QJxjLvV0aWfC8AAAqHPOHw:P1 (envelope-from ) for ; Mon, 23 Dec 2024 14:34:29 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id QJxjLvV0aWfC8AAAqHPOHw (envelope-from ) for ; Mon, 23 Dec 2024 15:34:29 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=MVJCMOMt; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=uGGyBxfR; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734964469; h=from:from:sender:sender:reply-to: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=VbVRc3EEQXNrOfgczgR/E0vFn9QBfvWXrPXYk9q5lBc=; b=pFAcZ2rC+tRjmaO7lFYK5Z2nnYcEetxxsZWqcBl5LY79VxgwHVYlpDCKe7NytepJ0lHt5Q l/sq/pHvbgFmDKROZzynLOl1EGRT3wQKTV5lz/RFnHQBbFRE3RHBPpIEiuNLSqcMnMDe6s XopYBPwXDvU0aU31LFszneqLNjiig8LD8944FDAgzPT879C56qtVMn/Ro2BpiACfjrKWUH uqcJKptMNuqwu+6nia+t42a4qL9QACXdqc21BYLLdT2W9aadGDOjpgyK9ijVKgX2R6q3xe HIAvQkA2gi9LaYm1SoL9fkEON2++KoPwNYLtuuDXCv/ON238QsWnA1V5TPEt+w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=MVJCMOMt; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=uGGyBxfR; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734964469; a=rsa-sha256; cv=none; b=EBu974qsR4kjo5F87xlJCxBFyVybJbZAxsxfIg3WPd1VmCMt5p67xHZWiJV/ZUdgPcQnnL RA6OaBoI7wLC9GBxd1xO+nWzzlyTbCTZ4aeQvT0BCqqFwpidYhGLCVkxf4/vrUhbOVbtgb FY4rQAwyh8ObueAPPBjKnfB3PKlN/rh5WSbbxu9cncPDyMxv9zSsStDUo2tah9LmYGgl3U qG4hYp4V+4BaS7uykXq6zPYL9ZrvOf8l4rkFCtKhIWQ6Z7ETHCYdxZByqlVV0WmHd33iO6 ErrzsJwimDsULrdag9yBkZ7WoLGgm6q8pQA7++Qgk8IKCR7GNMJInqRGdz4OOQ== 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 48A1625B5D for ; Mon, 23 Dec 2024 15:34:29 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tPjVc-0007qh-Ic; Mon, 23 Dec 2024 09:34:13 -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 1tPjVT-0007q6-FP for guix-patches@gnu.org; Mon, 23 Dec 2024 09:34:03 -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 1tPjVT-000805-64 for guix-patches@gnu.org; Mon, 23 Dec 2024 09:34:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=VbVRc3EEQXNrOfgczgR/E0vFn9QBfvWXrPXYk9q5lBc=; b=MVJCMOMtojCeGGbgKUh9wpaAJWY/xPsQzYplSe0QMlwYce96cMxcNj25I1S4cBiGVXJ20I9bdOEyhh+e0ubNqXSFZ3DelEK8f67fw0QH3mhSfmUq6/Yl+I/sIS/Ta0zvrT5YvVLoKRHsR0bmOH7Lxm/TDfJLdQckZjGodEFeMYh5jrKKdBU591V27DxNeRhJUGFJQjp0TPZYEavbKRPw2X/2c5dX0fDRE70j9IEygIDAf9fVM7CQ5WAsbc/40nPrglaTPIzZLQ4lYDTwauu4LEoiJdKq/Oxrb6uXtPJTCyWzcysgkRA879gbvmd2WYxF+kqtUW93XgMb7XjONXpf2g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tPjVS-0000Au-S1 for guix-patches@gnu.org; Mon, 23 Dec 2024 09:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75049] [PATCH] services: rootless-podman: Fix PATH lookup for Shepherd services. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Dec 2024 14:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75049 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75049@debbugs.gnu.org Cc: Giacomo Leidi X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1734964417628 (code B ref -1); Mon, 23 Dec 2024 14:34:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Dec 2024 14:33:37 +0000 Received: from localhost ([127.0.0.1]:53841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPjV2-0000A3-4F for submit@debbugs.gnu.org; Mon, 23 Dec 2024 09:33:36 -0500 Received: from lists.gnu.org ([209.51.188.17]:59818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPjV0-00009u-0i for submit@debbugs.gnu.org; Mon, 23 Dec 2024 09:33:34 -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 1tPjUz-0007nL-HW for guix-patches@gnu.org; Mon, 23 Dec 2024 09:33:33 -0500 Received: from confino.investici.org ([93.190.126.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tPjUx-0007xW-Ad for guix-patches@gnu.org; Mon, 23 Dec 2024 09:33:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1734964406; bh=VbVRc3EEQXNrOfgczgR/E0vFn9QBfvWXrPXYk9q5lBc=; h=From:To:Cc:Subject:Date:From; b=uGGyBxfRqDh55WElSldM7CSW6kNE45lLHrOwlommPlZlqhtITznGhDhxg7pQbNOum CdHkqq2jdPNuxfAlV7UPzSTDVu0slOkiAQa4l4LHm38Dhh9rSc9E5O9wFF+gWmbvyD +w3SIGzhUoDy8mzGwAh68wwW/2h8E9rXRBZCkUL8= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4YH0r62TJjz10xQ; Mon, 23 Dec 2024 14:33:26 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4YH0r61Jsdz10xF; Mon, 23 Dec 2024 14:33:26 +0000 (UTC) Date: Mon, 23 Dec 2024 15:33:20 +0100 Message-ID: <99a0c9bc2073bfe2f3bc21da3b1e84c15e0d6462.1734964400.git.goodoldpaul@autistici.org> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=93.190.126.19; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches From: Giacomo Leidi via Guix-patches via 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-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -0.41 X-Spam-Score: -0.41 X-Migadu-Queue-Id: 48A1625B5D X-TUID: AwFV+zJEYtTp One-shot Shepherd services required to correctly setup Podman in the Guix System, are failing to find executables upon boot. This patch changes the executable references to absolute paths to avoid PATH lookup. * gnu/services/containers.scm (cgroups-fs-owner-entrypoint): Hardcode bash path; (rootless-podman-cgroups-fs-owner-service): Ditto; (rootless-podman-fs-entrypoint): Hardcode mount path. Change-Id: Id6a27cadf51326ce57af93f57809b77e28dbeaef --- gnu/services/containers.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/services/containers.scm b/gnu/services/containers.scm index 03f0649c0d..d8f533f44c 100644 --- a/gnu/services/containers.scm +++ b/gnu/services/containers.scm @@ -17,6 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu services containers) + #:use-module (gnu packages bash) #:use-module (gnu packages containers) #:use-module (gnu packages file-systems) #:use-module (gnu services) @@ -134,7 +135,7 @@ (define (cgroups-fs-owner-entrypoint config) (rootless-podman-configuration-group-name config)) (program-file "cgroups2-fs-owner-entrypoint" #~(system* - "bash" "-c" + (string-append #+bash-minimal "/bin/bash") "-c" (string-append "echo Setting /sys/fs/cgroup " "group ownership to " #$group " && chown -v " "root:" #$group " /sys/fs/cgroup && " @@ -166,7 +167,7 @@ (define (rootless-podman-cgroups-fs-owner-service config) (define cgroups-limits-entrypoint (program-file "cgroups2-limits-entrypoint" #~(system* - "bash" "-c" + (string-append #+bash-minimal "/bin/bash") "-c" (string-append "echo Setting cgroups v2 limits && " "echo +cpu +cpuset +memory +pids" " >> /sys/fs/cgroup/cgroup.subtree_control")))) @@ -194,7 +195,7 @@ (define (rootless-podman-cgroups-limits-service config) (define rootless-podman-shared-root-fs-entrypoint (program-file "rootless-podman-shared-root-fs-entrypoint" #~(system* - "mount" "--make-shared" "/"))) + "/run/privileged/bin/mount" "--make-shared" "/"))) (define (rootless-podman-shared-root-fs-service config) (shepherd-service (provision '(rootless-podman-shared-root-fs)) base-commit: 1a55fa23d881a1816ebd05ebdacc55746a8c8ab9 -- 2.46.0