diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-10 21:25:39 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-12-15 17:32:10 +0100 |
| commit | 2aa512ec2843991804b5bf345c80abdb2b993bdc (patch) | |
| tree | e729e5544abf58dd33c0525c31db3ed50e9f7429 /gnu/build | |
| parent | 6a060ff27ff68384d7c90076baa36c349fff689d (diff) | |
| download | guix-patches-2aa512ec2843991804b5bf345c80abdb2b993bdc.tar guix-patches-2aa512ec2843991804b5bf345c80abdb2b993bdc.tar.gz | |
image: 'register-closure' leaves it up to the caller to deduplicate.
* gnu/build/image.scm (register-closure): Remove #:deduplicate?
parameter and pass #:deduplicate? #f to 'register-items'.
(initialize-root-partition): Adjust accordingly.
* gnu/build/vm.scm (register-closure, root-partition-initializer):
Likewise.
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/image.scm | 8 | ||||
| -rw-r--r-- | gnu/build/vm.scm | 9 |
2 files changed, 5 insertions, 12 deletions
diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 8f50f27f78..8d5fc603d9 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -140,21 +140,18 @@ given CONFIG file." (define* (register-closure prefix closure #:key - (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 DEDUPLICATE? is true, -deduplicates files common to CLOSURE and the rest of PREFIX. Pass WAL-MODE? -to call-with-database." +produced by #:references-graphs. Pass WAL-MODE? to call-with-database." (let ((items (call-with-input-file closure read-reference-graph))) (parameterize ((sql-schema schema)) (with-database (store-database-file #:prefix prefix) db #:wal-mode? wal-mode? (register-items db items #:prefix prefix - #:deduplicate? deduplicate? + #:deduplicate? #f #:registration-time %epoch))))) (define* (initialize-efi-partition root @@ -196,7 +193,6 @@ register-closure." (when register-closures? (for-each (lambda (closure) (register-closure root closure - #:deduplicate? #f #:wal-mode? wal-mode?)) references-graphs)) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 03be5697b7..8c6ab648ac 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -215,18 +215,16 @@ the #:references-graphs parameter of 'derivation'." (define* (register-closure prefix closure #:key - (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 DEDUPLICATE? is true, -deduplicates files common to CLOSURE and the rest of PREFIX." +produced by #:references-graphs." (let ((items (call-with-input-file closure read-reference-graph))) (parameterize ((sql-schema schema)) (with-database (store-database-file #:prefix prefix) db (register-items db items #:prefix prefix - #:deduplicate? deduplicate? + #:deduplicate? #f #:registration-time %epoch))))) @@ -412,8 +410,7 @@ system that is passed to 'populate-root-file-system'." (display "registering closures...\n") (for-each (lambda (closure) (register-closure target - (string-append "/xchg/" closure) - #:deduplicate? #f)) + (string-append "/xchg/" closure))) closures) (unless copy-closures? (umount target-store))) |