me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2014-05-18 19:11:53 +02:00
parent 1691b4cdc6
commit 15d299874c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/build/install.scm
View File

@ -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)

5
guix/build/vm.scm
View File

@ -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)))