GRUB EFI installation breakage

[Ludovic Courtès]

Hello,

To reconfigure my system on UEFI, I had to apply this patch:

modified   gnu/bootloader/grub.scm
@@ -401,7 +401,8 @@ submenu \"GNU system, old configurations...\" {~%")
         ;; root partition.
         (setenv "GRUB_ENABLE_CRYPTODISK" "y")
         (unless (zero? (system* grub-install "--boot-directory" install-dir
-                                "--efi-directory" efi-dir))
+                                ;; "--efi-directory" efi-dir
+                                ))
           (error "failed to install GRUB (EFI)")))))
 

Before that ‘grub-install’ would fail because ‘efi-dir’ would actually
be “/dev/sda”, which is what I have in the ‘device’ field of
‘grub-configuration’.

Removing the “--efi-directory” solves the problem because ‘grub-install’
automatically determines that the EFI directory is mounted at /boot/efi.

I think 2941b347b664a3d3114de0ac95e28db78db66144 is bogus because it
assumes that the second argument of the gexp’d lambda is ‘efi-dir’,
where in fact it is the ‘device’ field of the bootloader config.

So what is the preferred fix?  Simply remove “--efi-directory” like I
did above, and rename ‘efi-dir’ to ‘device’ to avoid the ambiguity?
Thoughts?

Ludo’.