Marius Bakke <mbakke@fastmail.com> writes:

> This ended up a lot simpler than anticipated.
>
> These patches are on top of <https://bugs.gnu.org/26339>, but can be
> ported to master since it ultimately didn't use any of the new tricks.

Never mind, grub-install picks up grub-efi when it should use normal
grub with these patches on current master, so #26339 is required.