GNU bug report logs - #71320
[PATCH] services: nix: Fix activation.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71320 in the body.
You can then email your comments to 71320 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>, Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH] services: nix: Fix activation.
Date: Sun,  2 Jun 2024 12:19:15 +0300

This commit follows 797be0ea5c3703ad96acd32c98dca5f946cf5c95.

* gnu/services/nix.scm (nix-activation): Avoid provisioning the store if it
already exists.

Reported-by: kiasoc5 <kiasoc5 <at> disroot.org>
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

Message #8 received at 71320 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Oleg Pykhalov <go.wigust <at> gmail.com>
Cc: kiasoc5 <kiasoc5 <at> disroot.org>, 71320 <at> debbugs.gnu.org
Subject: Re: [bug#71320] [PATCH] services: nix: Fix activation.
Date: Sun, 02 Jun 2024 15:14:56 +0200

Hi,

Oleg Pykhalov <go.wigust <at> gmail.com> skribis:

> This commit follows 797be0ea5c3703ad96acd32c98dca5f946cf5c95.
>
> * gnu/services/nix.scm (nix-activation): Avoid provisioning the store if it
> already exists.
>
> Reported-by: kiasoc5 <kiasoc5 <at> disroot.org>
> Change-Id: I159e8af5d7bd6ce62857b356d6e9ac68fe16acf4

Please add “Fixes …” if there’s an associated bug report.

Otherwise LGTM, thanks!

Ludo’.

Message #13 received at 71320-done <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: kiasoc5 <kiasoc5 <at> disroot.org>, 71320-done <at> debbugs.gnu.org
Subject: Re: [bug#71320] [PATCH] services: nix: Fix activation.
Date: Sun, 02 Jun 2024 18:44:40 +0300

[Message part 1 (text/plain, inline)]

Hi Ludovic,

Thank you for the review.

Ludovic Courtès <ludo <at> gnu.org> writes:

> Oleg Pykhalov <go.wigust <at> gmail.com> skribis:
>
>> This commit follows 797be0ea5c3703ad96acd32c98dca5f946cf5c95.
>>
>> * gnu/services/nix.scm (nix-activation): Avoid provisioning the store if it
>> already exists.
>>
>> Reported-by: kiasoc5 <kiasoc5 <at> disroot.org>
>> Change-Id: I159e8af5d7bd6ce62857b356d6e9ac68fe16acf4
>
> Please add “Fixes …” if there’s an associated bug report.
>
> Otherwise LGTM, thanks!

I've replaced 'Reported-by: kiasoc5 <kiasoc5 <at> disroot.org>' with:

    Reported by kiasoc5 <kiasoc5 <at> disroot.org> at
    <https://lists.gnu.org/archive/html/help-guix/2024-05/msg00185.html>.

similar to other commits.

Pushed as bc06affabcf68bbe93e9afee13bef8cc8c6336a2 to master.


Regards,
Oleg.

[signature.asc (application/pgp-signature, inline)]

Message #16 received at 71320-done <at> debbugs.gnu.org (full text, mbox):

From: kiasoc5 <kiasoc5 <at> disroot.org>
To: Oleg Pykhalov <go.wigust <at> gmail.com>, Ludovic Courtès
 <ludo <at> gnu.org>
Cc: 71320-done <at> debbugs.gnu.org
Subject: Re: [bug#71320] [PATCH] services: nix: Fix activation.
Date: Sun, 2 Jun 2024 19:03:36 -0400

On 6/2/24 11:44, Oleg Pykhalov wrote:
> Hi Ludovic,
> 
> Thank you for the review.
> 
> Ludovic Courtès <ludo <at> gnu.org> writes:
> 
>> Oleg Pykhalov <go.wigust <at> gmail.com> skribis:
>>
>>> This commit follows 797be0ea5c3703ad96acd32c98dca5f946cf5c95.
>>>
>>> * gnu/services/nix.scm (nix-activation): Avoid provisioning the store if it
>>> already exists.
>>>
>>> Reported-by: kiasoc5 <kiasoc5 <at> disroot.org>
>>> Change-Id: I159e8af5d7bd6ce62857b356d6e9ac68fe16acf4
>>
>> Please add “Fixes …” if there’s an associated bug report.
>>
>> Otherwise LGTM, thanks!
> 
> I've replaced 'Reported-by: kiasoc5 <kiasoc5 <at> disroot.org>' with:
> 
>      Reported by kiasoc5 <kiasoc5 <at> disroot.org> at
>      <https://lists.gnu.org/archive/html/help-guix/2024-05/msg00185.html>.
> 
> similar to other commits.
> 
> Pushed as bc06affabcf68bbe93e9afee13bef8cc8c6336a2 to master.
> 
> 
> Regards,
> Oleg.

Thanks! I'll report bugs to bug-guix next time.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.