From d9bf818408b7b2279f19860a5e638416cf20cd52 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 23 Aug 2012 09:22:43 -0700 Subject: [PATCH] use wildcard for product path to efi binaries (#851196) Depending on the product the path to these may be /fedora/ or /redhat/ so just use whatever they were installed under. --- share/efi.tmpl | 6 +++--- share/live/efi.tmpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/share/efi.tmpl b/share/efi.tmpl index aa430ec1..86221bc2 100644 --- a/share/efi.tmpl +++ b/share/efi.tmpl @@ -7,9 +7,9 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" mkdir ${EFIBOOTDIR} mkdir ${EFIBOOTDIR}/fonts/ -install boot/efi/EFI/fedora/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi -install boot/efi/EFI/fedora/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi -install boot/efi/EFI/fedora/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ +install boot/efi/EFI/*/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi +install boot/efi/EFI/*/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi +install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ install boot/grub/splash.xpm.gz ${EFIBOOTDIR} ## actually make the EFI images diff --git a/share/live/efi.tmpl b/share/live/efi.tmpl index 7664d903..a23e49d7 100644 --- a/share/live/efi.tmpl +++ b/share/live/efi.tmpl @@ -7,9 +7,9 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" mkdir ${EFIBOOTDIR} mkdir ${EFIBOOTDIR}/fonts/ -install boot/efi/EFI/fedora/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi -install boot/efi/EFI/fedora/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi -install boot/efi/EFI/fedora/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ +install boot/efi/EFI/*/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi +install boot/efi/EFI/*/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi +install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ install boot/grub/splash.xpm.gz ${EFIBOOTDIR} ## actually make the EFI images