efi, grub: use/efi/shell is now compatible with grub and doesn't use mki-efiboot

features.in/efi/config.mk

@@ -27,7 +27,8 @@ use/efi/grub: use/efi use/bootloader/grub
 
 ifeq (x86_64,$(ARCH))
 use/efi/shell: use/efi
-	@$(call try,EFI_SHELL,efi-shell)
+	@$(call add,STAGE1_PACKAGES,efi-shell)
+	@$(call add,GRUB_CFG,shell_efi)
 
 use/efi/signed: use/efi
 	@$(call set,EFI_CERT,altlinux)

features.in/efi/stage1/scripts.d/40-efi-shell

+#!/bin/sh -efu
+
+EFI_SHELL=/usr/lib64/efi/shell.efi
+[ -s "$EFI_SHELL" ] || exit 0
+
+mkdir -p "$WORKDIR"/boot
+cp "$EFI_SHELL" "$WORKDIR"/boot/

features.in/grub/cfg.in/91shell_efi.cfg

 if [ "$grub_platform" = "efi" ]; then
-	menuentry $"EFI shell" --id 'efishell' {
-		chainloader /EFI/shellx64.efi
-		boot
-	}
+  menuentry $"UEFI Shell (may not work with Secure Boot)" --id 'efishell' {
+    chainloader /boot/shell.efi
+  }
 fi