From e5078ff3210f4a9863b641a60430b2cb3c9c15ee Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sun, 12 May 2024 01:40:12 +0800 Subject: [PATCH] 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 --- gnu/system/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 3082bcff467..b0c96c60f0c 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"))))