From patchwork Tue Dec 21 19:36:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 35524 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 6FE7F27BBEA; Tue, 21 Dec 2021 19:37:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 3881127BBE9 for ; Tue, 21 Dec 2021 19:37:57 +0000 (GMT) Received: from localhost ([::1]:36074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzkxQ-000263-9Y for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 14:37:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwY-00023e-2A for guix-patches@gnu.org; Tue, 21 Dec 2021 14:37:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44150) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzkwX-0004Fp-PD for guix-patches@gnu.org; Tue, 21 Dec 2021 14:37:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzkwX-00077l-Kk for guix-patches@gnu.org; Tue, 21 Dec 2021 14:37:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52712] [PATCH v2 4/4] services: cuirass: Ensure correct ownership of directory trees. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 19:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52712 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52712@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164011541727355 (code B ref -1); Tue, 21 Dec 2021 19:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 19:36:57 +0000 Received: from localhost ([127.0.0.1]:55693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwT-000777-77 for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:36:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:37522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwS-00076t-0q for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:36:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwR-0001wI-Dx for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:55 -0500 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:42477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwP-0004Et-A5 for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:54 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id C450D240002 for ; Tue, 21 Dec 2021 19:36:51 +0000 (UTC) From: Brice Waegeneire Date: Tue, 21 Dec 2021 20:36:46 +0100 Message-Id: <20211221193646.16849-4-brice@waegenei.re> X-Mailer: git-send-email 2.34.0 In-Reply-To: <8735mleoxo.fsf_-_@waegenei.re> References: <8735mleoxo.fsf_-_@waegenei.re> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.193; envelope-from=brice@waegenei.re; helo=relay1-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/cuirass.scm (cuirass-activation): Replace 'chown' calls by 'lchown-recursive'. --- gnu/services/cuirass.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 96f28a9670..41e45604dd 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Jan Nieuwenhuizen ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu services cuirass) #:use-module (guix channels) #:use-module (guix gexp) + #:use-module (guix modules) #:use-module (guix records) #:use-module (guix store) #:use-module (guix utils) @@ -278,9 +280,11 @@ (define (cuirass-activation config) (profile (string-append "/var/guix/profiles/per-user/" user)) (roots (string-append profile "/cuirass")) (group (cuirass-configuration-group config))) - (with-imported-modules '((guix build utils)) + (with-imported-modules (source-module-closure + '((gnu build activation))) #~(begin - (use-modules (guix build utils)) + (use-modules (guix build utils) + (gnu build activation)) (mkdir-p #$cache) (mkdir-p #$log) @@ -291,13 +295,13 @@ (define (cuirass-activation config) (let ((uid (passwd:uid (getpw #$user))) (gid (group:gid (getgr #$group)))) - (chown #$cache uid gid) - (chown #$log uid gid) - (chown #$roots uid gid) - (chown #$profile uid gid) + (lchown-recursive #$cache uid gid) + (lchown-recursive #$log uid gid) + (lchown-recursive #$profile uid gid) + (lchown-recursive (passwd:dir (getpw #$user)) uid gid) (when #$remote-cache - (chown #$remote-cache uid gid))))))) + (lchown-recursive #$remote-cache uid gid))))))) (define (cuirass-log-rotations config) "Return the list of log rotations that corresponds to CONFIG."