From ce0b6ce40207426dbfec9a5472dc412307d86f41 Mon Sep 17 00:00:00 2001
From: Konstantin Vlasov <konstantin.vlasov@rosalab.ru>
Date: Thu, 20 Nov 2014 21:13:28 +0300
Subject: [PATCH] EFI: shim file renamed

---
 livecd-tools-21.1.shim.efi.renamed.patch | 31 ++++++++++++++++++++++++
 livecd-tools.spec                        |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 livecd-tools-21.1.shim.efi.renamed.patch

diff --git a/livecd-tools-21.1.shim.efi.renamed.patch b/livecd-tools-21.1.shim.efi.renamed.patch
new file mode 100644
index 0000000..c21514b
--- /dev/null
+++ b/livecd-tools-21.1.shim.efi.renamed.patch
@@ -0,0 +1,31 @@
+diff --git a/imgcreate/live.py b/imgcreate/live.py
+index 7678273..e9eb2ac 100644
+--- a/imgcreate/live.py
++++ b/imgcreate/live.py
+@@ -236,8 +236,8 @@ class LiveImageCreatorBase(LoopImageCreator):
+ 
+     def _generate_efiboot(self, isodir):
+         """Generate EFI boot images."""
+-        if not glob.glob(self._instroot+"/boot/efi/EFI/*/shim.efi"):
+-            logging.error("Missing shim.efi, skipping efiboot.img creation.")
++        if not glob.glob(self._instroot+"/boot/efi/EFI/*/BOOT*.efi"):
++            logging.error("Missing BOOT*.efi, skipping efiboot.img creation.")
+             return
+ 
+         # XXX-BCL: does this need --label?
+@@ -736,13 +736,13 @@ menu end
+         """ Copy the efi files into /EFI/BOOT/
+             If any of them are missing, return False.
+             requires:
+-              shim.efi
++              BOOT*.efi
+               grub.efi
+               fonts/unicode.pf2
+         """
+         fail = False
+         missing = []
+-        files = [("/boot/efi/EFI/*/shim.efi", "/EFI/BOOT/BOOT%s.efi" % (self.efiarch,)),
++        files = [("/boot/efi/EFI/*/BOOT*.efi", "/EFI/BOOT/"),
+                  ("/boot/efi/EFI/*/grub2-efi/grubcd.efi", "/EFI/BOOT/grubx64.efi"),
+                  ("/boot/grub2/themes/rosa/*", "/EFI/BOOT/themes/rosa/"),
+                  ("/boot/grub2/fonts/unicode.pf2", "/EFI/BOOT/fonts/"),
diff --git a/livecd-tools.spec b/livecd-tools.spec
index 46c46c0..77b7816 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -5,7 +5,7 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 21.1
-Release: 13
+Release: 14
 Epoch: 1
 License: GPLv2
 Group: System/Base
@@ -27,6 +27,7 @@ Patch10: livecd-tools-21.1.pkg.installation.fix.patch
 Patch11: livecd-tools-21.1.drop.initramfs.patch
 Patch12: livecd-tools-21.1.efi.no.dm.luks.patch
 Patch13: livecd-tools-21.1.basic.graphics.mode.fixed.patch
+Patch14: livecd-tools-21.1.shim.efi.renamed.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{epoch}:%{version}-%{release}
@@ -89,6 +90,7 @@ like live image or appliances.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 make