[PATCH] use wildcard for product path to efi binaries (#851196)

Brian C. Lane bcl at redhat.com
Thu Aug 23 16:55:23 UTC 2012


From: "Brian C. Lane" <bcl at redhat.com>

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 550e9e3..fa8b558 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 0daad49..4f457b6 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
-- 
1.7.11.4



More information about the anaconda-patches mailing list