diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-10 14:01:03 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-12-15 17:32:10 +0100 |
| commit | 0f15fd5c12e53c5e5307943f69ab25c0486244e9 (patch) | |
| tree | 843c4e249cbe686d9196fa56b2848fac184ff341 /gnu/build/vm.scm | |
| parent | 7b8d239ec241b9663820fed3bfde4344366f9d19 (diff) | |
| download | guix-0f15fd5c12e53c5e5307943f69ab25c0486244e9.tar guix-0f15fd5c12e53c5e5307943f69ab25c0486244e9.tar.gz | |
image: 'register-closure' assumes already-reset timestamps.
* gnu/build/image.scm (register-closure): Remove #:reset-timestamps?
parameter. Pass #:reset-timestamps? #f to 'register-items'.
(initialize-root-partition): Adjust accordingly.
* gnu/build/vm.scm (register-closure, root-partition-initializer):
Likewise.
Diffstat (limited to 'gnu/build/vm.scm')
| -rw-r--r-- | gnu/build/vm.scm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 30feaf800f..f700e08b25 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -215,12 +215,11 @@ the #:references-graphs parameter of 'derivation'." (define* (register-closure prefix closure #:key - (deduplicate? #t) (reset-timestamps? #t) + (deduplicate? #t) (schema (sql-schema))) "Register CLOSURE in PREFIX, where PREFIX is the directory name of the target store and CLOSURE is the name of a file containing a reference graph as -produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is -true, reset timestamps on store files and, if DEDUPLICATE? is true, +produced by #:references-graphs. As a side effect, if DEDUPLICATE? is true, deduplicates files common to CLOSURE and the rest of PREFIX." (let ((items (call-with-input-file closure read-reference-graph))) (parameterize ((sql-schema schema)) @@ -228,7 +227,7 @@ deduplicates files common to CLOSURE and the rest of PREFIX." (register-items db items #:prefix prefix #:deduplicate? deduplicate? - #:reset-timestamps? reset-timestamps? + #:reset-timestamps? #f #:registration-time %epoch))))) @@ -414,7 +413,6 @@ system that is passed to 'populate-root-file-system'." (for-each (lambda (closure) (register-closure target (string-append "/xchg/" closure) - #:reset-timestamps? #f #:deduplicate? deduplicate?)) closures) (unless copy-closures? |