diff mbox series

[bug#68488] image: Consider grub-efi-removable-bootloader to be EFI bootloader.

Message ID 8591c1022344b09e865048d2c20fbb8ee3375654.1705355855.git.~@wolfsden.cz
State New
Headers show
Series [bug#68488] image: Consider grub-efi-removable-bootloader to be EFI bootloader. | expand

Commit Message

Tomas Volf Jan. 15, 2024, 9:57 p.m. UTC 
Without this change, trying to create a system image with efi-raw type while
using grub-efi-removable-bootloader fails with fairly confusing message:

    EFI bootloader required with GPT partitioning

* gnu/system/image.scm (system-disk-image): Consider
grub-efi-removable-bootloader to be EFI bootloader.

Change-Id: I5f5e1a94e825fd29d6880c5bafb330e16a5ac962
---
 gnu/system/image.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


base-commit: 31e736dac29e6f0ff8a2de3f28e210a68684ad21

Comments

Mathieu Othacehe Jan. 17, 2024, 9:53 a.m. UTC | #1 
Hey,

> Without this change, trying to create a system image with efi-raw type while
> using grub-efi-removable-bootloader fails with fairly confusing message:
>
>     EFI bootloader required with GPT partitioning
>
> * gnu/system/image.scm (system-disk-image): Consider
> grub-efi-removable-bootloader to be EFI bootloader.

Looks good, applied. I agree the error message is misleading. Would you
like to give a try at rewording it? The goal is to prevent the failing
combination GPT + non-EFI bootloader.

Thanks,

Mathieu
diff mbox series

Patch

diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 2cc1012893..5456b3a5a0 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -535,7 +535,8 @@  (define* (system-disk-image image
 
     (when (and (gpt-image? image)
                (not
-                (memq (bootloader-name bootloader) '(grub-efi grub-efi32))))
+                (memq (bootloader-name bootloader)
+                      '(grub-efi grub-efi32 grub-efi-removable-bootloader))))
       (raise
        (formatted-message
         (G_ "EFI bootloader required with GPT partitioning"))))