aboutsummaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorZheng Junjie <zhengjunjie@iscas.ac.cn>2024-05-12 01:40:12 +0800
committerZheng Junjie <zhengjunjie@iscas.ac.cn>2024-05-22 11:15:29 +0800
commite5078ff3210f4a9863b641a60430b2cb3c9c15ee (patch)
treef18447c4319e53e5b8061d79f9751bb691a20dda /gnu/system
parent04aa2aab709fbdffeabfaf665f6acc0b2e91747a (diff)
downloadguix-e5078ff3210f4a9863b641a60430b2cb3c9c15ee.tar.gz
guix-e5078ff3210f4a9863b641a60430b2cb3c9c15ee.zip
image: Raise error when use both grub-efi* bootloader and not gpt image.
* gnu/system/image.scm: Switch Inversion logic, it allow we use customize bootloader with gpt image. Change-Id: I801327f6e826a37588b8f0f5246ca820e742f721
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/image.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 3082bcff46..b0c96c60f0 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -534,10 +534,10 @@ used in the image."
(image-partition-table-type image)))
(else "")))
- (when (and (gpt-image? image)
+ (when (and (memq (bootloader-name bootloader)
+ '(grub-efi grub-efi32 grub-efi-removable-bootloader))
(not
- (memq (bootloader-name bootloader)
- '(grub-efi grub-efi32 grub-efi-removable-bootloader))))
+ (gpt-image? image)))
(raise
(formatted-message
(G_ "EFI bootloader required with GPT partitioning"))))