[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: system: vm: Do not add EFI partition on ARM system.
|
From: |
Mathieu Othacehe |
|
Subject: |
02/02: system: vm: Do not add EFI partition on ARM system. |
|
Date: |
Fri, 1 Dec 2017 07:56:06 -0500 (EST) |
mothacehe pushed a commit to branch master
in repository guix.
commit 00e39b2ea466f5627b6eb85e70c98d44b73a0516
Author: Mathieu Othacehe <address@hidden>
Date: Wed Nov 29 15:12:01 2017 +0100
system: vm: Do not add EFI partition on ARM system.
* gnu/system/vm.scm (qemu-img): Do not add EFI partition if we are
targetting
ARM.
UEFI support on u-boot is still experimental, so do not add EFI partition on
ARM for now.
---
gnu/system/vm.scm | 50 ++++++++++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index a5fe48e..8cd4c06 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -29,6 +29,7 @@
#:use-module (guix monads)
#:use-module (guix records)
#:use-module (guix modules)
+ #:use-module (guix utils)
#:use-module ((gnu build vm)
#:select (qemu-command))
@@ -312,26 +313,35 @@ the image."
graphs)))
(- disk-image-size
(* 50 (expt 2 20)))))
- (partitions (list (partition
- (size root-size)
- (label #$file-system-label)
- (uuid #$(and=> file-system-uuid
- uuid-bytevector))
- (file-system #$file-system-type)
- (flags '(boot))
- (initializer initialize))
- ;; Append a small EFI System Partition for
- ;; use with UEFI bootloaders.
- (partition
- ;; The standalone grub image is about
10MiB, but
- ;; leave some room for custom or multiple
images.
- (size (* 40 (expt 2 20)))
- (label "GNU-ESP") ;cosmetic
only
- ;; Use "vfat" here since this property is
used
- ;; when mounting. The actual FAT-ness is
based
- ;; on filesystem size (16 in this case).
- (file-system "vfat")
- (flags '(esp))))))
+ (partitions
+ (append
+ (list (partition
+ (size root-size)
+ (label #$file-system-label)
+ (uuid #$(and=> file-system-uuid
+ uuid-bytevector))
+ (file-system #$file-system-type)
+ (flags '(boot))
+ (initializer initialize)))
+ ;; Append a small EFI System Partition for use with UEFI
+ ;; bootloaders if we are not targetting ARM because UEFI
+ ;; support in U-Boot is experimental.
+ ;;
+ ;; FIXME: ‘target-arm32?’ may be not operate on the right
+ ;; system/target values. Rewrite using ‘let-system’ when
+ ;; available.
+ (if #$(target-arm32?)
+ '()
+ (list (partition
+ ;; The standalone grub image is about 10MiB, but
+ ;; leave some room for custom or multiple
images.
+ (size (* 40 (expt 2 20)))
+ (label "GNU-ESP") ;cosmetic only
+ ;; Use "vfat" here since this property is used
+ ;; when mounting. The actual FAT-ness is based
+ ;; on filesystem size (16 in this case).
+ (file-system "vfat")
+ (flags '(esp))))))))
(initialize-hard-disk "/dev/vda"
#:partitions partitions
#:grub-efi #$grub-efi