From 0f15fd5c12e53c5e5307943f69ab25c0486244e9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 10 Dec 2020 14:01:03 +0100 Subject: 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. --- gnu/build/image.scm | 8 +++----- gnu/build/vm.scm | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 2857362914..4f80a1964f 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -140,13 +140,12 @@ given CONFIG file." (define* (register-closure prefix closure #:key - (deduplicate? #t) (reset-timestamps? #t) + (deduplicate? #t) (schema (sql-schema)) (wal-mode? #t)) "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. Pass WAL-MODE? to call-with-database." (let ((items (call-with-input-file closure read-reference-graph))) @@ -156,7 +155,7 @@ to call-with-database." (register-items db items #:prefix prefix #:deduplicate? deduplicate? - #:reset-timestamps? reset-timestamps? + #:reset-timestamps? #f #:registration-time %epoch))))) (define* (initialize-efi-partition root @@ -197,7 +196,6 @@ register-closure." (when register-closures? (for-each (lambda (closure) (register-closure root closure - #:reset-timestamps? #f #:deduplicate? deduplicate? #:wal-mode? wal-mode?)) references-graphs)) 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? -- cgit 1.4.1