From 7ba88931ac38116d1cd0fd9c70b38e5fcc2475a0 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 23 Aug 2012 14:54:19 -0700
Subject: [PATCH] change grub-cd.efi to gcdx64.efi (#851326)

grub2-2.00-5 has changed.
---
 share/efi.tmpl      | 2 +-
 share/live/efi.tmpl | 2 +-
 share/live/x86.tmpl | 2 +-
 share/x86.tmpl      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/efi.tmpl b/share/efi.tmpl
index 86221bc2..ba9aff4b 100644
--- a/share/efi.tmpl
+++ b/share/efi.tmpl
@@ -8,7 +8,7 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
 mkdir ${EFIBOOTDIR}
 mkdir ${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/*/gcdx64.efi ${EFIBOOTDIR}/grubx64.efi
 install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
 install boot/grub/splash.xpm.gz ${EFIBOOTDIR}
 
diff --git a/share/live/efi.tmpl b/share/live/efi.tmpl
index a23e49d7..1e2fa97b 100644
--- a/share/live/efi.tmpl
+++ b/share/live/efi.tmpl
@@ -8,7 +8,7 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
 mkdir ${EFIBOOTDIR}
 mkdir ${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/*/gcdx64.efi ${EFIBOOTDIR}/grubx64.efi
 install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
 install boot/grub/splash.xpm.gz ${EFIBOOTDIR}
 
diff --git a/share/live/x86.tmpl b/share/live/x86.tmpl
index 107ed053..8d31b8bc 100644
--- a/share/live/x86.tmpl
+++ b/share/live/x86.tmpl
@@ -49,7 +49,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
 ## WHeeeeeeee, EFI.
 ## We could remove the basearch restriction someday..
 <% efiargs=""; efigraft=""; efihybrid="" %>
-%if exists("boot/efi/EFI/fedora/grub-cd.efi") and basearch != 'i386':
+%if exists("boot/efi/EFI/fedora/gcdx64.efi") and basearch != 'i386':
     <%
     efiarch = 'X64' if basearch=='x86_64' else 'IA32'
     efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 849eef81..9e074e54 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -50,7 +50,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
 ## WHeeeeeeee, EFI.
 ## We could remove the basearch restriction someday..
 <% efiargs=""; efigraft=""; efihybrid="" %>
-%if exists("boot/efi/EFI/fedora/grub-cd.efi") and basearch != 'i386':
+%if exists("boot/efi/EFI/fedora/gcdx64.efi") and basearch != 'i386':
     <%
     efiarch = 'X64' if basearch=='x86_64' else 'IA32'
     efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)