diff options
author | Ryan Sundberg <ryan@arctype.co> | 2021-11-04 01:35:11 -0700 |
---|---|---|
committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-11-12 12:06:58 +0000 |
commit | 096a2bf8c59a955c634cc838e7f7111941c07b37 (patch) | |
tree | bba1ab86243c94a565fc3311cb8fafa1d8dcf07c | |
parent | 39754503e83f5f50ee25a2bcbac41d5bc436f7aa (diff) | |
download | guix-096a2bf8c59a955c634cc838e7f7111941c07b37.tar.gz guix-096a2bf8c59a955c634cc838e7f7111941c07b37.zip |
image: Support generating GPT images via `partition-table-type`.
* gnu/image.scm (<image>)[partition-table-type]: New field.
* gnu/system/image.scm: Implement partition-table-type logic for
genimage.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
-rw-r--r-- | gnu/image.scm | 3 | ||||
-rw-r--r-- | gnu/system/image.scm | 61 |
2 files changed, 47 insertions, 17 deletions
diff --git a/gnu/image.scm b/gnu/image.scm index 2381efa208..1c954af8cf 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -38,6 +38,7 @@ image-platform image-size image-operating-system + image-partition-table-type image-partitions image-compression? image-volatile-root? @@ -86,6 +87,8 @@ (default 'guess)) (operating-system image-operating-system ;<operating-system> (default #f)) + (partition-table-type image-partition-table-type ; 'mbr or 'gpt + (default 'mbr)) (partitions image-partitions ;list of <partition> (default '())) (compression? image-compression? ;boolean diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 7a807b8226..4b6aaf2e32 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -298,6 +298,14 @@ used in the image." ((member 'esp flags) "0xEF") (else "0x83")))) + (define (partition->gpt-type partition) + ;; Return the genimage GPT partition type code corresponding to PARTITION. + ;; See https://github.com/pengutronix/genimage/blob/master/README.rst + (let ((flags (partition-flags partition))) + (cond + ((member 'esp flags) "U") + (else "L")))) + (define (partition-image partition) ;; Return as a file-like object, an image of the given PARTITION. A ;; directory, filled by calling the PARTITION initializer procedure, is @@ -347,26 +355,44 @@ used in the image." #:local-build? #f #:options `(#:references-graphs ,inputs)))) - (define (partition->config partition) + (define (gpt-image? image) + (eq? 'gpt (image-partition-table-type image))) + + (define (partition-type-values image partition) + (if (gpt-image? image) + (values "partition-type-uuid" (partition->gpt-type partition)) + (values "partition-type" (partition->dos-type partition)))) + + (define (partition->config image partition) ;; Return the genimage partition configuration for PARTITION. - (let ((label (partition-label partition)) - (dos-type (partition->dos-type partition)) - (image (partition-image partition)) - (offset (partition-offset partition))) - #~(format #f "~/partition ~a { -~/~/partition-type = ~a -~/~/image = \"~a\" -~/~/offset = \"~a\" -~/}" - #$label - #$dos-type - #$image - #$offset))) + (let-values (((partition-type-attribute partition-type-value) + (partition-type-values image partition))) + (let ((label (partition-label partition)) + (image (partition-image partition)) + (offset (partition-offset partition))) + #~(format #f "~/partition ~a { + ~/~/~a = ~a + ~/~/image = \"~a\" + ~/~/offset = \"~a\" + ~/}" + #$label + #$partition-type-attribute + #$partition-type-value + #$image + #$offset)))) + + (define (genimage-type-options image-type image) + (cond + ((equal? image-type "hdimage") + (format #f "~%~/~/gpt = ~a~%~/" + (if (gpt-image? image) "true" "false"))) + (else ""))) (let* ((format (image-format image)) (image-type (format->image-type format)) + (image-type-options (genimage-type-options image-type image)) (partitions (image-partitions image)) - (partitions-config (map partition->config partitions)) + (partitions-config (map (cut partition->config image <>) partitions)) (builder #~(begin (let ((format (@ (ice-9 format) format))) @@ -375,9 +401,10 @@ used in the image." (format port "\ image ~a { -~/~a {} +~/~a {~a} ~{~a~^~%~} -}~%" #$genimage-name #$image-type (list #$@partitions-config)))))))) +}~%" #$genimage-name #$image-type #$image-type-options + (list #$@partitions-config)))))))) (computed-file "genimage.cfg" builder))) (let* ((image-name (image-name image)) |