guix system: 'init' copies, resets timestamps, and deduplicates at once.

Partly fixes <https://bugs.gnu.org/44760>.

* guix/build/store-copy.scm (copy-store-item): New procedure.
(populate-store): Use it instead of the inline 'copy-recursively' call.
* guix/scripts/system.scm (copy-item): Likewise.
Pass #:reset-timestamps? and #:deduplicate? to 'register-path'.
This commit is contained in:
Ludovic Courtès 2020-12-11 10:37:06 +01:00
parent 0793833c59
commit cd6c5ddfc8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 29 additions and 13 deletions

View file

@ -30,6 +30,7 @@
#:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix store)
#:autoload (guix store database) (register-path)
#:autoload (guix build store-copy) (copy-store-item)
#:use-module (guix describe)
#:use-module (guix grafts)
#:use-module (guix gexp)
@ -147,8 +148,8 @@ REFERENCES as its set of references."
#:directories? #t))
(delete-file-recursively dest))
(copy-recursively item dest
#:log (%make-void-port "w"))
(copy-store-item item target
#:deduplicate? #t)
;; Register ITEM; as a side-effect, it resets timestamps, etc.
;; Explicitly use "TARGET/var/guix" as the state directory, to avoid
@ -157,7 +158,11 @@ REFERENCES as its set of references."
(unless (register-path item
#:prefix target
#:state-directory state
#:references references)
#:references references
;; Those are taken care of by 'copy-store-item'.
#:reset-timestamps? #f
#:deduplicate? #f)
(leave (G_ "failed to register '~a' under '~a'~%")
item target))))