bug#71320: closed ([PATCH] services: nix: Fix activation.)

[GNU bug Tracking System]

Your message dated Sun, 02 Jun 2024 18:44:40 +0300
with message-id <8734pv9wnr.fsf@gmail.com>
and subject line Re: [bug#71320] [PATCH] services: nix: Fix activation.
has caused the debbugs.gnu.org bug report #71320,
regarding [PATCH] services: nix: Fix activation.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
71320: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=71320
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> 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@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
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#71320] [PATCH] services: nix: Fix activation. Date: Sun, 02 Jun 2024 18:44:40 +0300 User-agent: Gnus/5.13 (Gnus v5.13)

Hi Ludovic,

Thank you for the review.

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

> Oleg Pykhalov <go.wigust@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@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@disroot.org>' with:

    Reported by kiasoc5 <kiasoc5@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
Description: PGP signature

--- End Message ---