From patchwork Sun Dec 12 18:36:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 35149 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 C50DE27BBEA; Sun, 12 Dec 2021 18:37:10 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 945E927BBE9 for ; Sun, 12 Dec 2021 18:37:10 +0000 (GMT) Received: from localhost ([::1]:51140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mwTif-0005uJ-Cj for patchwork@mira.cbaines.net; Sun, 12 Dec 2021 13:37:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwTiY-0005tX-9V for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mwTiY-0001Kl-0f for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mwTiX-0003qj-UI for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52454] [PATCH 1/4] syscalls: Add 'lchown'. References: <87h7bdad9o.fsf@waegenei.re> In-Reply-To: <87h7bdad9o.fsf@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Dec 2021 18:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52454@debbugs.gnu.org Received: via spool by 52454-submit@debbugs.gnu.org id=B52454.163933419614727 (code B ref 52454); Sun, 12 Dec 2021 18:37:01 +0000 Received: (at 52454) by debbugs.gnu.org; 12 Dec 2021 18:36:36 +0000 Received: from localhost ([127.0.0.1]:53098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwTi8-0003pS-6f for submit@debbugs.gnu.org; Sun, 12 Dec 2021 13:36:36 -0500 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:44385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwTi6-0003pB-IU for 52454@debbugs.gnu.org; Sun, 12 Dec 2021 13:36:35 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id E5329240005 for <52454@debbugs.gnu.org>; Sun, 12 Dec 2021 18:36:28 +0000 (UTC) From: Brice Waegeneire Date: Sun, 12 Dec 2021 19:36:11 +0100 Message-Id: <20211212183614.19730-1-brice@waegenei.re> X-Mailer: git-send-email 2.34.0 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 * guix/build/syscalls.scm (lchown): New procedure. --- guix/build/syscalls.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 63bd017d1d..1c432507c3 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,6 +119,7 @@ (define-module (guix build syscalls) scandir* getxattr setxattr + lchown fcntl-flock lock-file @@ -1275,6 +1277,20 @@ (define* (scandir* name #:optional (lambda () (closedir* directory))))) +(define lchown + (let ((proc (syscall->procedure int "lchown" (list '* int int)))) + (lambda (file owner group) + "As 'chown', change the ownership and group of the file referred to by +FILE to the integer values OWNER and GROUP but doesn't dereference symbolic +links. Unlike 'chown' this doesn't support port or integer file descriptor +via 'fchown'." + (let-values (((ret err) + (proc (string->pointer file) owner group))) + (unless (zero? ret) + (throw 'system-error "lchown" "~S: ~A" + (list file (strerror err)) + (list err))))))) + ;;; ;;; Advisory file locking. From patchwork Sun Dec 12 18:36:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 35151 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 EE6E727BBEA; Sun, 12 Dec 2021 18:37:11 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 BB88C27BBE9 for ; Sun, 12 Dec 2021 18:37:11 +0000 (GMT) Received: from localhost ([::1]:51200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mwTig-0005wT-Gc for patchwork@mira.cbaines.net; Sun, 12 Dec 2021 13:37:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwTiZ-0005tr-1c for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mwTiY-0001LJ-Oo for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mwTiY-0003qx-N5 for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52454] [PATCH 2/4] activation: Add 'lchown-recursive'. References: <87h7bdad9o.fsf@waegenei.re> In-Reply-To: <87h7bdad9o.fsf@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Dec 2021 18:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52454@debbugs.gnu.org Received: via spool by 52454-submit@debbugs.gnu.org id=B52454.163933420114763 (code B ref 52454); Sun, 12 Dec 2021 18:37:02 +0000 Received: (at 52454) by debbugs.gnu.org; 12 Dec 2021 18:36:41 +0000 Received: from localhost ([127.0.0.1]:53105 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwTiB-0003pw-Q2 for submit@debbugs.gnu.org; Sun, 12 Dec 2021 13:36:40 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:55661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwTi8-0003pD-RE for 52454@debbugs.gnu.org; Sun, 12 Dec 2021 13:36:37 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id B3F7960006 for <52454@debbugs.gnu.org>; Sun, 12 Dec 2021 18:36:29 +0000 (UTC) From: Brice Waegeneire Date: Sun, 12 Dec 2021 19:36:12 +0100 Message-Id: <20211212183614.19730-2-brice@waegenei.re> X-Mailer: git-send-email 2.34.0 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 * gnu/build/activation.scm (lchown-recursive): New procedure. --- gnu/build/activation.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index 9f6126023c..79c835a045 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -30,7 +30,7 @@ (define-module (gnu build activation) #:use-module (gnu build accounts) #:use-module (gnu build linux-boot) #:use-module (guix build utils) - #:use-module ((guix build syscalls) #:select (with-file-lock)) + #:use-module ((guix build syscalls) #:select (with-file-lock lchown)) #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (ice-9 vlist) @@ -46,7 +46,8 @@ (define-module (gnu build activation) activate-firmware activate-ptrace-attach activate-current-system - mkdir-p/perms)) + mkdir-p/perms + lchown-recursive)) ;;; Commentary: ;;; @@ -105,6 +106,23 @@ (define (mkdir-p/perms directory owner bits) (chown directory (passwd:uid owner) (passwd:gid owner)) (chmod directory bits)) +(define (lchown-recursive file owner group) + "As 'lchown' but recursively, change ownership of FILE to the integer values +OWNER and GROUP without dereferencing symbolic links it encounter." + (nftw file + (lambda (filename statinfo flag base level) + (catch 'system-error + (lambda () + (when (member flag '(regular directory symlink)) + (lchown filename owner group))) + (lambda args + (format (current-error-port) + "warning: failed to chown ~s: ~a~%" + filename + (strerror (system-error-errno args))))) + #t) + 'physical)) + (define* (copy-account-skeletons home #:key (directory %skeleton-directory) From patchwork Sun Dec 12 18:36:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 35150 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 7224C27BBEA; Sun, 12 Dec 2021 18:37:11 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 380D827BBE9 for ; Sun, 12 Dec 2021 18:37:11 +0000 (GMT) Received: from localhost ([::1]:51176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mwTig-0005vZ-A4 for patchwork@mira.cbaines.net; Sun, 12 Dec 2021 13:37:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwTiY-0005tf-LY for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mwTiY-0001L5-Ck for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mwTiY-0003qq-AO for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52454] [PATCH 3/4] services: postgresql: Ensure correct ownership of directory trees. References: <87h7bdad9o.fsf@waegenei.re> In-Reply-To: <87h7bdad9o.fsf@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Dec 2021 18:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52454@debbugs.gnu.org Received: via spool by 52454-submit@debbugs.gnu.org id=B52454.163933419914755 (code B ref 52454); Sun, 12 Dec 2021 18:37:02 +0000 Received: (at 52454) by debbugs.gnu.org; 12 Dec 2021 18:36:39 +0000 Received: from localhost ([127.0.0.1]:53103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwTiB-0003ps-Fv for submit@debbugs.gnu.org; Sun, 12 Dec 2021 13:36:39 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:53299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwTi8-0003pF-QG for 52454@debbugs.gnu.org; Sun, 12 Dec 2021 13:36:37 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 731FAFF807 for <52454@debbugs.gnu.org>; Sun, 12 Dec 2021 18:36:30 +0000 (UTC) From: Brice Waegeneire Date: Sun, 12 Dec 2021 19:36:13 +0100 Message-Id: <20211212183614.19730-3-brice@waegenei.re> X-Mailer: git-send-email 2.34.0 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 * gnu/services/databases.scm (postgresql-activation): Replace 'chown' calls by 'lchown-recursive'. --- gnu/services/databases.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 8e983ef0be..83f9fe5239 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 David Larsson +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -214,8 +215,11 @@ (define postgresql-activation (($ postgresql port locale config-file log-directory data-directory extension-packages) - #~(begin + (with-imported-modules (source-module-closure + '((gnu build activation))) + #~(begin (use-modules (guix build utils) + (gnu build activation) (ice-9 match)) (let ((user (getpwnam "postgres")) @@ -230,19 +234,19 @@ (define postgresql-activation '())))) ;; Create db state directory. (mkdir-p #$data-directory) - (chown #$data-directory (passwd:uid user) (passwd:gid user)) + (lchown-recursive #$data-directory (passwd:uid user) (passwd:gid user)) ;; Create the socket directory. (let ((socket-directory #$(postgresql-config-file-socket-directory config-file))) (when (string? socket-directory) (mkdir-p socket-directory) - (chown socket-directory (passwd:uid user) (passwd:gid user)))) + (lchown-recursive socket-directory (passwd:uid user) (passwd:gid user)))) ;; Create the log directory. (when (string? #$log-directory) (mkdir-p #$log-directory) - (chown #$log-directory (passwd:uid user) (passwd:gid user))) + (lchown-recursive #$log-directory (passwd:uid user) (passwd:gid user))) ;; Drop privileges and init state directory in a new ;; process. Wait for it to finish before proceeding. @@ -262,7 +266,7 @@ (define postgresql-activation initdb-args))) (lambda () (primitive-exit 1)))) - (pid (waitpid pid)))))))) + (pid (waitpid pid))))))))) (define postgresql-shepherd-service (match-lambda From patchwork Sun Dec 12 18:36:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 35152 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 051A527BBEA; Sun, 12 Dec 2021 18:37:17 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 C431D27BBE9 for ; Sun, 12 Dec 2021 18:37:16 +0000 (GMT) Received: from localhost ([::1]:51786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mwTim-0006M1-0x for patchwork@mira.cbaines.net; Sun, 12 Dec 2021 13:37:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwTiZ-0005u7-Dj for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mwTiZ-0001Li-5O for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mwTiZ-0003r5-35 for guix-patches@gnu.org; Sun, 12 Dec 2021 13:37:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52454] [PATCH 4/4] services: cuirass: Ensure correct ownership of directory trees. References: <87h7bdad9o.fsf@waegenei.re> In-Reply-To: <87h7bdad9o.fsf@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Dec 2021 18:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52454@debbugs.gnu.org Received: via spool by 52454-submit@debbugs.gnu.org id=B52454.163933420114769 (code B ref 52454); Sun, 12 Dec 2021 18:37:03 +0000 Received: (at 52454) by debbugs.gnu.org; 12 Dec 2021 18:36:41 +0000 Received: from localhost ([127.0.0.1]:53107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwTiC-0003q4-UI for submit@debbugs.gnu.org; Sun, 12 Dec 2021 13:36:41 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:37225) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwTi8-0003pG-SI for 52454@debbugs.gnu.org; Sun, 12 Dec 2021 13:36:37 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id F0BFCFF802 for <52454@debbugs.gnu.org>; Sun, 12 Dec 2021 18:36:30 +0000 (UTC) From: Brice Waegeneire Date: Sun, 12 Dec 2021 19:36:14 +0100 Message-Id: <20211212183614.19730-4-brice@waegenei.re> X-Mailer: git-send-email 2.34.0 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 * 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 a69c20adb8..116c12063e 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."