guix system: init: Always use /var/guix as the target state directory.
Fixes <http://bugs.gnu.org/18049>. Reported by Marek Benc <merkur32@gmail.com>. * guix/scripts/system.scm (copy-closure): Pass #:state-directory to 'register-path'.
This commit is contained in:
parent
689142cd75
commit
a52127c052
1 changed files with 6 additions and 1 deletions
|
@ -99,14 +99,19 @@ (define* (copy-closure item target
|
|||
#:key (log-port (current-error-port)))
|
||||
"Copy ITEM to the store under root directory TARGET and register it."
|
||||
(mlet* %store-monad ((refs (references* item)))
|
||||
(let ((dest (string-append target item)))
|
||||
(let ((dest (string-append target item))
|
||||
(state (string-append target "/var/guix")))
|
||||
(format log-port "copying '~a'...~%" item)
|
||||
(copy-recursively item dest
|
||||
#:log (%make-void-port "w"))
|
||||
|
||||
;; Register ITEM; as a side-effect, it resets timestamps, etc.
|
||||
;; Explicitly use "TARGET/var/guix" as the state directory, to avoid
|
||||
;; reproducing the user's current settings; see
|
||||
;; <http://bugs.gnu.org/18049>.
|
||||
(unless (register-path item
|
||||
#:prefix target
|
||||
#:state-directory state
|
||||
#:references refs)
|
||||
(leave (_ "failed to register '~a' under '~a'~%")
|
||||
item target))
|
||||
|
|
Loading…
Reference in a new issue