91-grub-mkconfig.install: avoid finding random efi apps

Signed-off-by: Nowa Ammerlaan <nowa@gentoo.org>
projg2 · Feb 22, 2025 · 77da93d · 77da93d
1 parent 7e71056
commit 77da93d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/hooks/91-grub-mkconfig.install b/hooks/91-grub-mkconfig.install
@@ -52,11 +52,15 @@ main() {
 	: "${NAME:=Linux}"
 
 	# The default GRUB_LINUX_KERNEL_GLOBS from /etc/grub/10_linux expanded
-	# with BLS type 2 locations where we may install an UKI
+	# with efistub dir
 	: "${GRUB_LINUX_KERNEL_GLOBS:="
-		/boot/vmlinuz-* /boot/vmlinux-* /boot/kernel-* /vmlinuz-* /vmlinux-*
-		/kernel-* /boot/EFI/EFI/${NAME}/*.efi /boot/efi/EFI/${NAME}/*.efi
-		/boot/EFI/${NAME}/*.efi /efi/EFI/${NAME}/*.efi
+		/boot/vmlinuz-* /boot/vmlinux-* /boot/kernel-* /vmlinuz-* /vmlinux-* /kernel-*
+		/boot/EFI/EFI/${NAME}/vmlinuz-*.efi /boot/EFI/EFI/${NAME}/vmlinux-*.efi
+		/boot/EFI/EFI/${NAME}/kernel-*.efi /boot/efi/EFI/${NAME}/vmlinuz-*.efi
+		/boot/efi/EFI/${NAME}/vmlinux-*.efi /boot/efi/EFI/${NAME}/kernel-*.efi
+		/boot/EFI/${NAME}/vmlinuz-*.efi /boot/EFI/${NAME}/vmlinux-*.efi
+		/boot/EFI/${NAME}/kernel-*.efi /efi/EFI/${NAME}/vmlinuz-*.efi
+		/efi/EFI/${NAME}/vmlinux-*.efi /efi/EFI/${NAME}/kernel-*.efi
 	"}"
 	export GRUB_LINUX_KERNEL_GLOBS
 

diff --git a/hooks/systemd/91-grub-mkconfig.install b/hooks/systemd/91-grub-mkconfig.install
@@ -41,16 +41,24 @@ fi
 : "${NAME:=Linux}"
 
 # The default GRUB_LINUX_KERNEL_GLOBS from /etc/grub/10_linux expanded
-# with BLS type 2 locations where we may install an UKI
+# with efistub dir
 : "${GRUB_LINUX_KERNEL_GLOBS:="
 	/vmlinuz-* /vmlinux-* /kernel-*
-	/efi/EFI/${NAME}/*.efi
+	/efi/EFI/${NAME}/vmlinuz-*.efi
+	/efi/EFI/${NAME}/vmlinux-*.efi
+	/efi/EFI/${NAME}/kernel-*.efi
 	${KERNEL_INSTALL_BOOT_ROOT}/vmlinuz-*
 	${KERNEL_INSTALL_BOOT_ROOT}/vmlinux-*
 	${KERNEL_INSTALL_BOOT_ROOT}/kernel-*
-	${KERNEL_INSTALL_BOOT_ROOT}/EFI/${NAME}/*.efi
-	${KERNEL_INSTALL_BOOT_ROOT}/EFI/EFI/${NAME}/*.efi
-	${KERNEL_INSTALL_BOOT_ROOT}/efi/EFI/${NAME}/*.efi
+	${KERNEL_INSTALL_BOOT_ROOT}/EFI/${NAME}/vmlinuz-*.efi
+	${KERNEL_INSTALL_BOOT_ROOT}/EFI/${NAME}/vmlinux-*.efi
+	${KERNEL_INSTALL_BOOT_ROOT}/EFI/${NAME}/kernel-*.efi
+	${KERNEL_INSTALL_BOOT_ROOT}/EFI/EFI/${NAME}/vmlinuz-*.efi
+	${KERNEL_INSTALL_BOOT_ROOT}/EFI/EFI/${NAME}/vmlinux-*.efi
+	${KERNEL_INSTALL_BOOT_ROOT}/EFI/EFI/${NAME}/kernel-*.efi
+	${KERNEL_INSTALL_BOOT_ROOT}/efi/EFI/${NAME}/vmlinuz-*.efi
+	${KERNEL_INSTALL_BOOT_ROOT}/efi/EFI/${NAME}/vmlinux-*.efi
+	${KERNEL_INSTALL_BOOT_ROOT}/efi/EFI/${NAME}/kernel-*.efi
 "}"
 export GRUB_LINUX_KERNEL_GLOBS