From patchwork Fri Mar 14 17:48:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 40171 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 40D1F27BBE9; Fri, 14 Mar 2025 17:51: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 2276127BBE2 for ; Fri, 14 Mar 2025 17:51:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tt9B6-0005CP-GZ; Fri, 14 Mar 2025 13:50:36 -0400 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 1tt9Ai-00056J-1H for guix-patches@gnu.org; Fri, 14 Mar 2025 13:50:13 -0400 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 1tt9Ah-0002Dh-Ds for guix-patches@gnu.org; Fri, 14 Mar 2025 13:50:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=wZDaJpSBiec4HWURn73Fvz7bhdz1AmvaDkV9vu9Mxas=; b=DvDu09qQWae3YAHWavcdx6vYx8ThCmFShamOIiYmX0vxtVwMV8ezqngRqJ8P9hAJ/kva/EXuT4HtDx0+TwTt46XzhCD6RhT/S/d9kU+jVDLUo0I+j9Qtn5y82aDY4Fa2v0EAaR3s4f+U3H2DwOvLJrQEbkRTYi0DZEsz6cniUnsUh8LE95bIdL2646E/4d6ASj9+fvx9U/7rLJesDeGCsaZrvVo7uAMxkBUg+UhATMv4up4Is+fpp/x1OtdOl9fTqkbT/qu0tHH5mKvHtxULpuBYuYo+UxHQHbotsRjP4uA8g34rQax9odvB9TUsnE7q4yTaa0Jf0bqhc6J6W6bqCw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tt9Af-0004SG-1M for guix-patches@gnu.org; Fri, 14 Mar 2025 13:50:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75810] [PATCH v5 07/14] daemon: Create /var/guix/profiles/per-user unconditionally. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Mar 2025 17:50:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75810 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75810@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 75810-submit@debbugs.gnu.org id=B75810.174197460817117 (code B ref 75810); Fri, 14 Mar 2025 17:50:08 +0000 Received: (at 75810) by debbugs.gnu.org; 14 Mar 2025 17:50:08 +0000 Received: from localhost ([127.0.0.1]:36037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tt9Ad-0004Ro-0f for submit@debbugs.gnu.org; Fri, 14 Mar 2025 13:50:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56584) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tt9AO-0004Ou-7U for 75810@debbugs.gnu.org; Fri, 14 Mar 2025 13:49:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tt9AI-0001yf-Pm; Fri, 14 Mar 2025 13:49:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=wZDaJpSBiec4HWURn73Fvz7bhdz1AmvaDkV9vu9Mxas=; b=Wgbn8aA26jwmIJfRLGDy Q4ZXa7YQl4XpZ+JrvAHYM5LCKM9znFPedKEUYR20Y+FOqRHEyExU7fpYn38kmNn0TwYStjNvThNpz lRdxgIuij6PlbLu5++eDIfoyW+laQwpsAPZtZFUrl8IcOXD0krBPlHdXjN6rZZvZZzCHXAwJPPukO O4OH3LRrg/+E23cRJRsznuOuBXRkgOJdHJFhTH1ioFpm9C4f6v6kl8XQvAaNvIBejv8puyP0vzv+W jtTivZJfI8yPWeSlneJcz/cwiTxazbEI18V4Vc6Wn6SI6D4QZ0LKK1boVsghoawhUYGRQu8sL/j0V Un+rhCQpWCrm3Q==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 14 Mar 2025 18:48:04 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * nix/libstore/local-store.cc (LocalStore::LocalStore): Create ‘perUserDir’ unconditionally. Change-Id: I5188320f9630a81d16f79212d0fffabd55d94abe --- nix/libstore/local-store.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index 83e6c3e16e..f6540c2117 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -79,12 +79,12 @@ LocalStore::LocalStore(bool reserveSpace) createSymlink(profilesDir, gcRootsDir + "/profiles"); } - /* Optionally, create directories and set permissions for a - multi-user install. */ + Path perUserDir = profilesDir + "/per-user"; + createDirs(perUserDir); + + /* Optionally, set permissions for a multi-user install. */ if (getuid() == 0 && settings.buildUsersGroup != "") { - Path perUserDir = profilesDir + "/per-user"; - createDirs(perUserDir); if (chmod(perUserDir.c_str(), 0755) == -1) throw SysError(format("could not set permissions on '%1%' to 755") % perUserDir);