From: srs5694 <srs5694@users.sourceforge.net>
Date: Sun, 12 Jan 2014 22:09:54 +0000 (-0500)
Subject: Adjusted RPM/Debian package script to find Ubuntu's shimx64.efi, not
X-Git-Url: https://code.delx.au/refind/commitdiff_plain/a47c54f5f264a4d7d89d37bcd77aa6ee7b53dcb3

Adjusted RPM/Debian package script to find Ubuntu's shimx64.efi, not
just Fedora's shim.efi.
---

diff --git a/NEWS.txt b/NEWS.txt
index 7c6e1eb..a1f8687 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,16 @@
+0.7.8 (?/??/2014):
+------------------
+
+- Adjusted the post-installation script in refind.spec (used to generate
+  RPMs, and therefore also indirectly Debian packages) to search for
+  existing shim program files under the filesnames shim.efi and shimx64.efi
+  rather than just shim.efi. Ubuntu uses shimx64.efi, so Debian packages
+  were failing to detect Ubuntu's shim in previous versions. (Note,
+  however, that Ubuntu's early shim 0.1 is unsuitable for use with rEFInd
+  The newer 0.4 version that's in the repositories now should work fine;
+  it's only when installing on an older system that's NOT been updated that
+  problems might arise.
+
 0.7.7 (1/3/2014):
 -----------------
 
diff --git a/refind.spec b/refind.spec
index 6d928b2..427aee6 100644
--- a/refind.spec
+++ b/refind.spec
@@ -126,7 +126,9 @@ fi
 cd /usr/share/refind-%{version}
 
 declare VarFile=`ls -d /sys/firmware/efi/vars/SecureBoot* 2> /dev/null`
-declare ShimFile=`find /boot -name shim\.efi 2> /dev/null | head -n 1`
+# Note: Two find operations for ShimFile favors shim over PreLoader -- if both are
+# present, the script uses shim rather than PreLoader.
+declare ShimFile=`find /boot -name shim\.efi -o -name shimx64\.efi -o -name PreLoader\.efi 2> /dev/null | head -n 1`
 if [[ ! -n $ShimFile ]] ; then
    declare ShimFile=`find /boot -name PreLoader\.efi 2> /dev/null | head -n 1`
 fi