vm: Avoid resetting timestamps twice.
* guix/build/vm.scm (initialize-hard-disk): Don't call 'reset-timestamps' when REGISTER-CLOSURES? is true. * guix/build/install.scm (register-closure): Mention timestamps in docstring.
This commit is contained in:
parent
1691b4cdc6
commit
15d299874c
|
@ -103,7 +103,7 @@ as created and modified at the Epoch."
|
||||||
(define (register-closure store closure)
|
(define (register-closure store closure)
|
||||||
"Register CLOSURE in STORE, where STORE is the directory name of the target
|
"Register CLOSURE in STORE, where STORE is the directory name of the target
|
||||||
store and CLOSURE is the name of a file containing a reference graph as used
|
store and CLOSURE is the name of a file containing a reference graph as used
|
||||||
by 'guix-register'."
|
by 'guix-register'. As a side effect, this resets timestamps on store files."
|
||||||
(let ((status (system* "guix-register" "--prefix" store
|
(let ((status (system* "guix-register" "--prefix" store
|
||||||
closure)))
|
closure)))
|
||||||
(unless (zero? status)
|
(unless (zero? status)
|
||||||
|
|
|
@ -211,7 +211,10 @@ further populate the partition."
|
||||||
(unless (install-grub grub.cfg "/dev/sda" target-directory)
|
(unless (install-grub grub.cfg "/dev/sda" target-directory)
|
||||||
(error "failed to install GRUB"))
|
(error "failed to install GRUB"))
|
||||||
|
|
||||||
(reset-timestamps target-directory)
|
;; 'guix-register' resets timestamps and everything, so no need to do it
|
||||||
|
;; once more in that case.
|
||||||
|
(unless register-closures?
|
||||||
|
(reset-timestamps target-directory))
|
||||||
|
|
||||||
(zero? (system* "umount" target-directory)))
|
(zero? (system* "umount" target-directory)))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue