From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id QND8GoM5XGYhZgAAqHPOHw:P1 (envelope-from ) for ; Sun, 02 Jun 2024 11:21:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id QND8GoM5XGYhZgAAqHPOHw (envelope-from ) for ; Sun, 02 Jun 2024 11:21:07 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=djCUYlXP; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717320067; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=UHtjNanIfieKxwccU2UKrc/cN2TzA7Xr7R2GXGgwpDw=; b=nYT4nAO/Ewpqcu0ueycxwPCRxIgPkl3vFrHCXN3QkicsOmWtA+M78EVvS20LeDWwiJw61w HU7GdckVqTtFeIxYIg4LDo72+uBlfBDrGZ/Mrfb3tXKBpSKErez3Qqq1LPXFQHapTs3KiP +na80p2PmurWURuL+uDvJ0vDa4y920gkveMbWHjrAJE5oF7eobj1XuP0mnNz6IbLYuwDA7 5sKLdrwgjV99euDQ/PfgXr96BlqmlYchBcR+oZEjXaK+ci33dMazw3+NltfCAvRk3hudBg rGpP+5MsnRQ9FOVe6wHByYjAH0c8gX/+xAmSi6DlQOWqBC1lKKe2dNfwcW4Jng== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=djCUYlXP; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717320067; a=rsa-sha256; cv=none; b=jVcEdwje/xMh8jXR89h85UyxUNSFGpL0urIYZy3T49T3jHPHXPzYYXFn0H71B+rRYL0lE6 t55aTEATYlmk1yciGwTeJp+PrZUDonCSC/dvulD5OqRrjah7Ojd48/TD2AukklNsbt5ByZ JoDj1e1QN2iImaXJ1nTDcrbNcEh0WREUxQpomWQXOeo7zzQtPc6aay43F7/i6c+1OP5eLx BeImwvY1Odi73Y1cpPGEr0gcRy0DgFEJlca8mQEvV9XdhyG82ixh06m+M3KpblVVfY3iTc IkKvLxw3b/n2XlSSPKFWK2ImjH5hGAE/8DWHgAR+J5cZKGZX4HkEwXjY+vNtkA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4524E6589A for ; Sun, 2 Jun 2024 11:21:07 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sDhOW-0003qX-Mx; Sun, 02 Jun 2024 05:20:52 -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 1sDhOV-0003pg-4M for guix-patches@gnu.org; Sun, 02 Jun 2024 05:20:51 -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 1sDhOU-0003Fu-Rs for guix-patches@gnu.org; Sun, 02 Jun 2024 05:20:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sDhOg-0000UF-MQ for guix-patches@gnu.org; Sun, 02 Jun 2024 05:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71320] [PATCH] services: nix: Fix activation. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Jun 2024 09:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71320 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71320@debbugs.gnu.org Cc: kiasoc5 , Oleg Pykhalov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17173200441817 (code B ref -1); Sun, 02 Jun 2024 09:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jun 2024 09:20:44 +0000 Received: from localhost ([127.0.0.1]:57825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDhON-0000TF-Nw for submit@debbugs.gnu.org; Sun, 02 Jun 2024 05:20:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:40460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDhOL-0000T1-4b for submit@debbugs.gnu.org; Sun, 02 Jun 2024 05:20:42 -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 1sDhO8-0003BR-Jn for guix-patches@gnu.org; Sun, 02 Jun 2024 05:20:28 -0400 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sDhO2-00038v-CQ for guix-patches@gnu.org; Sun, 02 Jun 2024 05:20:28 -0400 Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2e95ab5a45dso3307881fa.3 for ; Sun, 02 Jun 2024 02:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717320019; x=1717924819; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UHtjNanIfieKxwccU2UKrc/cN2TzA7Xr7R2GXGgwpDw=; b=djCUYlXPPsFyv8WlmPd1CvkOH3KN8x6w7xtlgLyIh9+4s259HEOYfO8gpHQZw41atb 8s9OfBRGHKqxPBdagfIsm+hG6NjUblTJpndx4KpQlC25e+dcx9lDLx2GJe0XhO2FQcjV lQgrBYQLMyBgeEA59931yoXZY0HuszGvYPd8N5QvgEJZA3qavBCIfDcz8r3UjrnAN2YT FHjcLvwGDGG3F1FjqLdXQE0h0Aj1GXuOrc8TtszU6ksR6YGuhNFa/YVIftxYWGdIu5KM PcC+vVoosCLAnBwqmsekrFWTYBVimPPjfU83SLA4PfK9xD0yRVyYbxFO7f8d1vXzflP2 NmHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717320019; x=1717924819; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UHtjNanIfieKxwccU2UKrc/cN2TzA7Xr7R2GXGgwpDw=; b=WSyvJI2laCWQ76YClnMaNOIN67fr/9zecg3wG25sGEsOoyMxytnrQrpMo947LhkLRQ Pjkfl1sMyajZ3IcMvIj117UPSHshTQpTugCl1+dDbtYly7XjYtaPbKWxyTRQ/wM27Z/R iz5P7wqreoIv4TZbjmbgupb8q099A/cI3b41G4Vp8DQb7ubKZ8qAhXorV4jZ0RhCE2cL fi8HszoYqnmDzGnw1DIfzpoGwxVq/zc9kidLBvMgyR1Hh+gQ8GWns6XPXKVPgitb4Y+3 yszm/iMoMZxX70OJLEWIt0KbJH87WiKP1FnWHMDZuARcr/lCiwhViJGTvuRwRgUXuWAb mJmQ== X-Gm-Message-State: AOJu0YxsehHV58ow2PcENuGZKuTOORwr9pu1gZOoIQgHJ2+k20mmPCHO jb/+1fkqDS8R/eUSnfGccB0pCBFbyxG3TS1xSXvGLBzFIYWOBPMnUnHrsA== X-Google-Smtp-Source: AGHT+IERs8SwITgkLRLZ1gtbF/qwc+FTspXm0iP8CNwL745zjsnHpY6olVGTTUun6TltrfPsRnX21A== X-Received: by 2002:ac2:52a6:0:b0:529:b796:1ca with SMTP id 2adb3069b0e04-52b895a8530mr3301047e87.2.1717320018797; Sun, 02 Jun 2024 02:20:18 -0700 (PDT) Received: from guixsd.wugi.info ([93.100.15.190]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52b84d8966asm888676e87.257.2024.06.02.02.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jun 2024 02:20:18 -0700 (PDT) From: Oleg Pykhalov Date: Sun, 2 Jun 2024 12:19:15 +0300 Message-ID: <0634886cfb6a49988f427b2e0f7d10492decc931.1717319955.git.go.wigust@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::232; envelope-from=go.wigust@gmail.com; helo=mail-lj1-x232.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 2.96 X-Spam-Score: 2.96 X-Migadu-Queue-Id: 4524E6589A X-Migadu-Scanner: mx13.migadu.com X-TUID: TCaaz7fVre+T This commit follows 797be0ea5c3703ad96acd32c98dca5f946cf5c95. * gnu/services/nix.scm (nix-activation): Avoid provisioning the store if it already exists. Reported-by: kiasoc5 Change-Id: I159e8af5d7bd6ce62857b356d6e9ac68fe16acf4 --- gnu/services/nix.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/services/nix.scm b/gnu/services/nix.scm index 419e5968fe..9749fc9e0f 100644 --- a/gnu/services/nix.scm +++ b/gnu/services/nix.scm @@ -98,12 +98,14 @@ (define (nix-activation _) #~(begin (use-modules (guix build utils) (srfi srfi-26)) - (for-each (cut mkdir-p <>) '("/nix/store" "/nix/var/log" + (for-each (cut mkdir-p <>) '("/nix/var/log" "/nix/var/nix/gcroots/per-user" "/nix/var/nix/profiles/per-user")) - (chown "/nix/store" - (passwd:uid (getpw "root")) (group:gid (getpw "nixbld01"))) - (chmod "/nix/store" #o775) + (unless (file-exists? #$%nix-store-directory) + (mkdir-p #$%nix-store-directory) + (chown #$%nix-store-directory + (passwd:uid (getpw "root")) (group:gid (getpw "nixbld01"))) + (chmod #$%nix-store-directory #o775)) (for-each (cut chmod <> #o777) '("/nix/var/nix/profiles" "/nix/var/nix/profiles/per-user")))) base-commit: 6f72ad465c1e2df965e8d73b209497b4ef456527 -- 2.41.0