ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

image: Add default value for partition initializer.

Browse source 
Previously, the default value would lead to a wrong-type-to-apply crash.

* gnu/system/image.scm (system-disk-image)[image-builder]: When
'partition-initializer' returns #f, fall back to
INITIALIZE-ROOT-PARTITION.
* gnu/tests/base.scm (run-root-unmount-test)[test-image]: Remove
'initializer' field of partition.
* gnu/image.scm (<partition>)[initializer]: Add comment.
This commit is contained in:
Ludovic Courtès 2022-07-01 10:26:17 +02:00
parent e871c3a857
commit 9f530ef38a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/image.scm
View file

@ -70,7 +70,7 @@ (define-record-type* <partition> partition make-partition
(label partition-label (default #f)) (label partition-label (default #f))
(uuid partition-uuid (default #f)) (uuid partition-uuid (default #f))
(flags partition-flags (default '())) (flags partition-flags (default '()))
(initializer partition-initializer (default #f))) (initializer partition-initializer (default #f))) ;gexp | #f
;;; ;;;

3
gnu/system/image.scm
View file

@ -374,7 +374,8 @@ (define (partition-image partition)
(type (partition-file-system partition)) (type (partition-file-system partition))
(image-builder (image-builder
(with-imported-modules* (with-imported-modules*
(let ((initializer #$(partition-initializer partition)) (let ((initializer (or #$(partition-initializer partition)
initialize-root-partition))
(inputs '#+(list e2fsprogs fakeroot dosfstools mtools)) (inputs '#+(list e2fsprogs fakeroot dosfstools mtools))
(image-root "tmp-root")) (image-root "tmp-root"))
(sql-schema #$schema) (sql-schema #$schema)

1
gnu/tests/base.scm
View file

@ -637,7 +637,6 @@ (define test-image
(size 'guess) (size 'guess)
(offset (* 512 2048)) ;leave room for GRUB (offset (* 512 2048)) ;leave room for GRUB
(flags '(boot)) (flags '(boot))
(initializer #~initialize-root-partition)
(label "root-under-test")))))) ;max 16 characters! (label "root-under-test")))))) ;max 16 characters!
(define observer-os (define observer-os