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)