diff options
| author | Marius Bakke <marius@gnu.org> | 2022-06-27 19:23:48 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-06-27 19:23:48 +0200 |
| commit | 2a7648774f1bba5bb443c00b8ab1a2ab75b7416f (patch) | |
| tree | 3e081532d1d4f83706b62b499f655ea3ed836e5b /gnu/system | |
| parent | 43519035f954b3dc41ac50a9a877fd802b864fdb (diff) | |
| parent | 0bd1c4fbbc8a438876d6efa4feb275de461a2484 (diff) | |
| download | guix-2a7648774f1bba5bb443c00b8ab1a2ab75b7416f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/image.scm | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm index f02f6e0b8c..5972a944d7 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2022 Pavel Shlyak <p.shlyak@pantherx.org> +;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,6 +67,7 @@ root-label esp-partition + esp32-partition root-partition efi-disk-image @@ -75,6 +77,7 @@ image-with-os efi-raw-image-type + efi32-raw-image-type qcow2-image-type iso-image-type uncompressed-iso-image-type @@ -110,6 +113,11 @@ (flags '(esp)) (initializer (gexp initialize-efi-partition)))) +(define esp32-partition + (partition + (inherit esp-partition) + (initializer (gexp initialize-efi32-partition)))) + (define root-partition (partition (size 'guess) @@ -123,6 +131,11 @@ (format 'disk-image) (partitions (list esp-partition root-partition)))) +(define efi32-disk-image + (image + (format 'disk-image) + (partitions (list esp32-partition root-partition)))) + (define iso9660-image (image (format 'iso9660) @@ -164,6 +177,11 @@ set to the given OS." (name 'efi-raw) (constructor (cut image-with-os efi-disk-image <>)))) +(define efi32-raw-image-type + (image-type + (name 'efi32-raw) + (constructor (cut image-with-os efi32-disk-image <>)))) + (define qcow2-image-type (image-type (name 'qcow2) @@ -376,6 +394,7 @@ used in the image." #$(image-shared-store? image)) #:system-directory #$os #:grub-efi #+grub-efi + #:grub-efi32 #+grub-efi32 #:bootloader-package #+(bootloader-package bootloader) #:bootloader-installer |