diff options
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/image.scm | 16 | ||||
| -rw-r--r-- | gnu/build/install.scm | 3 | ||||
| -rw-r--r-- | gnu/build/linux-boot.scm | 5 | ||||
| -rw-r--r-- | gnu/build/linux-initrd.scm | 3 | ||||
| -rw-r--r-- | gnu/build/vm.scm | 14 |
5 files changed, 16 insertions, 25 deletions
diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 640a784204..f6e5cb42f6 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -140,23 +140,17 @@ given CONFIG file." (define* (register-closure prefix closure #:key - (deduplicate? #t) (reset-timestamps? #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, -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? - #:reset-timestamps? reset-timestamps? #:registration-time %epoch))))) (define* (initialize-efi-partition root @@ -188,7 +182,8 @@ rest of the store when registering the closures. SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation. Pass WAL-MODE? to register-closure." (populate-root-file-system system-directory root) - (populate-store references-graphs root) + (populate-store references-graphs root + #:deduplicate? deduplicate?) ;; Populate /dev. (when make-device-nodes @@ -196,10 +191,7 @@ register-closure." (when register-closures? (for-each (lambda (closure) - (register-closure root - closure - #:reset-timestamps? #t - #:deduplicate? deduplicate? + (register-closure root closure #:wal-mode? wal-mode?)) references-graphs)) diff --git a/gnu/build/install.scm b/gnu/build/install.scm index 63995e1d09..f5c8407b89 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -214,7 +214,8 @@ This is used to create the self-contained tarballs with 'guix pack'." (symlink old (scope new))) ;; Populate the store. - (populate-store (list closure) directory) + (populate-store (list closure) directory + #:deduplicate? #f) (when database (install-database-and-gc-roots directory database profile diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index bfaac9ec1f..f20eeaac9f 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -560,7 +560,10 @@ upon error." (load-linux-modules-from-directory linux-modules linux-module-directory) - (unless (member "noresume" args) + (unless (or (member "hibernate=noresume" args) + ;; Also handle the equivalent old-style argument. + ;; See Documentation/admin-guide/kernel-parameters.txt. + (member "noresume" args)) ;; Try to resume immediately after loading (storage) modules ;; but before any on-disk file systems have been mounted. (false-if-exception ; failure is not fatal diff --git a/gnu/build/linux-initrd.scm b/gnu/build/linux-initrd.scm index 99796adba6..bb2ed0db0c 100644 --- a/gnu/build/linux-initrd.scm +++ b/gnu/build/linux-initrd.scm @@ -127,7 +127,8 @@ REFERENCES-GRAPHS." (mkdir "contents") ;; Copy the closures of all the items referenced in REFERENCES-GRAPHS. - (populate-store references-graphs "contents") + (populate-store references-graphs "contents" + #:deduplicate? #f) (with-directory-excursion "contents" ;; Make '/init'. diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 287d099f79..bd59916bf3 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -215,20 +215,15 @@ the #:references-graphs parameter of 'derivation'." (define* (register-closure prefix closure #:key - (deduplicate? #t) (reset-timestamps? #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, -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? - #:reset-timestamps? reset-timestamps? #:registration-time %epoch))))) @@ -397,7 +392,8 @@ system that is passed to 'populate-root-file-system'." (when copy-closures? ;; Populate the store. (populate-store (map (cut string-append "/xchg/" <>) closures) - target)) + target + #:deduplicate? deduplicate?)) ;; Populate /dev. (make-device-nodes target) @@ -413,9 +409,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) - #:reset-timestamps? copy-closures? - #:deduplicate? deduplicate?)) + (string-append "/xchg/" closure))) closures) (unless copy-closures? (umount target-store))) |