diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2025-07-01 23:13:29 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-07-01 23:40:09 +0200 |
| commit | c33bc8008090bafda228e475dedc71cd06f56e4f (patch) | |
| tree | d61c51e5f0fbcc17c59c0f50c97512d8eb864ba6 | |
| parent | 04e80066a2ecb90b3cd75200e758aa071222fcd3 (diff) | |
services: guix: ‘guix-ownership’ changes store ownership last.
Fixes <https://issues.guix.gnu.org/78355>.
* gnu/services/base.scm (guix-ownership-change-program)[claim-data-ownership]:
Replace hard-coded “/gnu/store” with #$(store-prefix). Change store
ownership last.
Reported-by: Rutherther <rutherther@ditigal.xyz>
Change-Id: I55189f8bb82bf0c9e030aa042aa928f6f552569e
| -rw-r--r-- | gnu/services/base.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 88dbcbf72a..cfebfcda0f 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1997,10 +1997,9 @@ of Guix to the given UID and GID." lstat)) (define (claim-data-ownership uid gid) - (format #t "Changing file ownership for /gnu/store \ + (format #t "Changing file ownership for ~a \ and data directories to ~a:~a...~%" - uid gid) - (change-ownership #$(%store-prefix) uid gid) + #$(%store-prefix) uid gid) (let ((excluded '("." ".." "profiles" "userpool"))) (for-each (lambda (directory) (change-ownership (in-vicinity "/var/guix" directory) @@ -2012,7 +2011,11 @@ and data directories to ~a:~a...~%" (chown "/var/guix" uid gid) (change-ownership "/etc/guix" uid gid) (mkdir-p "/var/log/guix") - (change-ownership "/var/log/guix" uid gid)) + (change-ownership "/var/log/guix" uid gid) + + ;; Change the store last so that, if this service is interrupted, + ;; ownership appears as having yet to be changed. + (change-ownership #$(%store-prefix) uid gid)) (match (command-line) ((_ (= string->number (? integer? uid)) |