From patchwork Tue Dec 21 19:36:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 35528 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 4FC4327BBEA; Tue, 21 Dec 2021 19:42:52 +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,URIBL_BLOCKED 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 AF5AE27BBE9 for ; Tue, 21 Dec 2021 19:42:51 +0000 (GMT) Received: from localhost ([::1]:41872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzl2A-0006I2-Rr for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 14:42:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkxX-0002fD-13 for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44160) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzkxW-0004Kn-ON for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzkxW-0007AB-Mz for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52715] [PATCH v2 1/4] syscalls: Add 'lchown'. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 19:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52715 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52715@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164011544227472 (code B ref -1); Tue, 21 Dec 2021 19:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 19:37:22 +0000 Received: from localhost ([127.0.0.1]:55704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwd-00078d-Dd for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:37:22 -0500 Received: from lists.gnu.org ([209.51.188.17]:37572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwT-000778-8A for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:36:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwT-0001y9-1V for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:57 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:57037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwP-0004Ej-8L for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:56 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay12.mail.gandi.net (Postfix) with ESMTPSA id C7D1F200004 for ; Tue, 21 Dec 2021 19:36:49 +0000 (UTC) From: Brice Waegeneire Date: Tue, 21 Dec 2021 20:36:43 +0100 Message-Id: <20211221193646.16849-1-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.178.232; envelope-from=brice@waegenei.re; helo=relay12.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_H2=-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 * guix/build/syscalls.scm (lchown): New procedure. * gnu/packages/patches/guile-3.0-linux-syscalls.patch: Add lchown. * tests/syscalls.scm ("lchown, ENOENT", "lchown, no changes", "lchown, regular file", "lchown, symlink"): New tests. --- .../patches/guile-3.0-linux-syscalls.patch | 33 ++++++++++ guix/build/syscalls.scm | 16 +++++ tests/syscalls.scm | 62 +++++++++++++++++++ 3 files changed, 111 insertions(+) diff --git a/gnu/packages/patches/guile-3.0-linux-syscalls.patch b/gnu/packages/patches/guile-3.0-linux-syscalls.patch index 0d27f77ee2..77edd9a993 100644 --- a/gnu/packages/patches/guile-3.0-linux-syscalls.patch +++ b/gnu/packages/patches/guile-3.0-linux-syscalls.patch @@ -3,7 +3,40 @@ This patch adds bindings to Linux syscalls for which glibc has symbols. Using the FFI would have been nice, but that's not an option when using a statically-linked Guile in an initrd that doesn't have libc.so around. +diff --git a/libguile/filesys.c b/libguile/filesys.c +index 4f7115397..2ade4cfca 100644 +--- a/libguile/filesys.c ++++ b/libguile/filesys.c +@@ -192,6 +192,27 @@ SCM_DEFINE (scm_chown, "chown", 3, 0, 0, + #undef FUNC_NAME + #endif /* HAVE_CHOWN */ + ++SCM_DEFINE (scm_lchown, "lchown", 3, 0, 0, ++ (SCM object, SCM owner, SCM group), ++ "As 'chown', change the ownership and group of the file referred to by\n" ++ "@var{file} to the integer values @var{owner} and @var{group} but\n" ++ "doesn't dereference symbolic links. Unlike 'chown' this doesn't support\n" ++ "port or integer file descriptor via 'fchown'.") ++#define FUNC_NAME s_scm_lchown ++{ ++ int rv; ++ ++ object = SCM_COERCE_OUTPORT (object); ++ ++ STRING_SYSCALL (object, c_object, ++ rv = lchown (c_object, ++ scm_to_int (owner), scm_to_int (group))); ++ if (rv == -1) ++ SCM_SYSERROR; ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ + + + SCM_DEFINE (scm_open_fdes, "open-fdes", 2, 1, 0, diff --git a/libguile/posix.c b/libguile/posix.c +index a1520abc4..61d57cdb9 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -2375,6 +2375,336 @@ scm_init_popen (void) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 45f95c509d..dbb96997d6 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 @@ -1277,6 +1279,20 @@ (define* (scandir* name #:optional (lambda () (closedir* directory))))) +(define-as-needed 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. diff --git a/tests/syscalls.scm b/tests/syscalls.scm index c9e011f453..24a8fd9726 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -287,6 +287,68 @@ (define perform-container-tests? (scandir* directory) (scandir directory (const #t) string X-Patchwork-Id: 35527 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 9BEE027BBEA; Tue, 21 Dec 2021 19:42:39 +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 6E7C627BBE9 for ; Tue, 21 Dec 2021 19:42:39 +0000 (GMT) Received: from localhost ([::1]:41434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzl1y-00060F-L8 for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 14:42:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwY-00023f-Md for guix-patches@gnu.org; Tue, 21 Dec 2021 14:37:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzkwY-0004Fu-C3 for guix-patches@gnu.org; Tue, 21 Dec 2021 14:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzkwY-00077z-A9 for guix-patches@gnu.org; Tue, 21 Dec 2021 14:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52713] [PATCH v2 2/4] activation: Add 'lchown-recursive'. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 19:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52713@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164011541827363 (code B ref -1); Tue, 21 Dec 2021 19:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 19:36:58 +0000 Received: from localhost ([127.0.0.1]:55696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwT-00077A-HB for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:36:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:37524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwS-00076u-0w for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:36:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwR-0001wK-EY for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:55 -0500 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:41335) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwP-0004Ek-9p 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 7EC24240003 for ; Tue, 21 Dec 2021 19:36:50 +0000 (UTC) From: Brice Waegeneire Date: Tue, 21 Dec 2021 20:36:44 +0100 Message-Id: <20211221193646.16849-2-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/build/activation.scm (lchown-recursive): New procedure. --- gnu/build/activation.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index 9f6126023c..fff2d61b13 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -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 Tue Dec 21 19:36:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 35525 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 DEA4227BBEA; Tue, 21 Dec 2021 19:38:26 +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 80C2827BBE9 for ; Tue, 21 Dec 2021 19:38:26 +0000 (GMT) Received: from localhost ([::1]:36942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzkxt-0002hp-Mc for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 14:38:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkxW-0002fA-Co for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzkxW-0004Kg-3h for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzkxW-00079x-2l for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52714] [PATCH v2 3/4] services: postgresql: 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:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52714 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52714@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164011542727446 (code B ref -1); Tue, 21 Dec 2021 19:38:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 19:37:07 +0000 Received: from localhost ([127.0.0.1]:55702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwd-00078Z-0A for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:37:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:37552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwT-000775-2F for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:36:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwS-0001xd-NW for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:56 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:45729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwP-0004Em-BS for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:56 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 45DF960009 for ; Tue, 21 Dec 2021 19:36:50 +0000 (UTC) From: Brice Waegeneire Date: Tue, 21 Dec 2021 20:36:45 +0100 Message-Id: <20211221193646.16849-3-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.195; envelope-from=brice@waegenei.re; helo=relay3-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/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 39225a4bd6..58d93a8e35 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 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."