nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Ludovic Courtès 2014-07-18 11:07:33 +02:00
parent 689142cd75
commit a52127c052
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/scripts/system.scm
View File

@ -99,14 +99,19 @@
#:key (log-port (current-error-port))) #:key (log-port (current-error-port)))
"Copy ITEM to the store under root directory TARGET and register it." "Copy ITEM to the store under root directory TARGET and register it."
(mlet* %store-monad ((refs (references* item))) (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) (format log-port "copying '~a'...~%" item)
(copy-recursively item dest (copy-recursively item dest
#:log (%make-void-port "w")) #:log (%make-void-port "w"))
;; Register ITEM; as a side-effect, it resets timestamps, etc. ;; 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 (unless (register-path item
#:prefix target #:prefix target
#:state-directory state
#:references refs) #:references refs)
(leave (_ "failed to register '~a' under '~a'~%") (leave (_ "failed to register '~a' under '~a'~%")
item target)) item target))