Version 0.8.7 release.

diff --git a/NEWS.txt b/NEWS.txt
index e09c92ac4fba5790e2461aed9362cffce262baaf..bf04e439b4b5e3560f69974b7e13e4c12b19db25 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,6 +1,10 @@
 0.8.7 (3/1/2015):
 -----------------
 
 0.8.7 (3/1/2015):
 -----------------
 

+- Fixed install.sh bug that caused inappropriate installation under the
+  name bootx64.efi (or bootia32.efi) under Linux, with a failure to update
+  the boot entries in NVRAM, has been fixed.
+

 - Added identification of XFS as filesystem type in volume descriptions.
 
 - More fixes to filesystem type detection code. Previous version sometimes
 - Added identification of XFS as filesystem type in volume descriptions.
 
 - More fixes to filesystem type detection code. Previous version sometimes

diff --git a/debian/changelog b/debian/changelog
index 692e95436f445e0399d4a1f1d3340e05886aedc1..98769733f02150953708bd3bb4a394da06d9eea4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+refind (0.8.7-0ppa1) trusty; urgency=medium
+
+  * Version bump
+
+ -- Roderick Smith <rodsmith@rodsbooks.com>  Sun, 01 Mar 2015 18:32:25 -0500
+

 refind (0.8.6-0ppa1) trusty; urgency=medium
 
   * Version bump
 refind (0.8.6-0ppa1) trusty; urgency=medium
 
   * Version bump

diff --git a/docs/refind/revisions.html b/docs/refind/revisions.html
index 5ceeae417168c0f17b9519d20cb59abf1456eb53..c709f9615e0691d7a02079ebbff8f68551c4be3d 100644 (file)
--- a/docs/refind/revisions.html
+++ b/docs/refind/revisions.html
@@ -130,7 +130,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
 
 <ul>
 
 
 <ul>
 

-<li><b>0.8.7 (3/1/2015)</b>&mdash;This release provides bug fixes and refinements to existing features. Several changes should reduce the odds of rEFInd crashing because of assorted problems. Other changes improve Secure Boot handling, including improved Secure Boot detection in <tt>install.sh</tt>, recognition of <tt>KeyTool.efi</tt> and <tt>KeyTool-signed.efi</tt> as MOK manager utilities, and reporting of Secure Boot status for <i>x</i>86 (IA-32) systems in the rEFInd information screen. Filesystem detection is improved (again), and XFS has been added as a known filesystem. Detection of FreeBSD's BIOS-mode boot loader is improved, which should give more Mac users the right OS icon when booting FreeBSD in BIOS mode. Finally, I'm <i><b>deprecating</b></i> the use of <tt>fs<tt class="variable">x</tt>:</tt> notation for referring to filesystems. The numbering of filesystems is simply unreliable, and better alternatives (the use of partition GUIDs, partition names, and filesystem names) have been added in previous releases. The <tt>fs<tt class="variable">x</tt>:</tt> code remains in rEFInd, and if it's working for you, you can continue to use it; but sooner or later I'll remove that code, so you're advised to change your manual boot stanzas and other options that use it before that happens.</li>
+<li><b>0.8.7 (3/1/2015)</b>&mdash;This release provides bug fixes and refinements to existing features. Several changes should reduce the odds of rEFInd crashing because of assorted problems. Other changes improve Secure Boot handling, including improved Secure Boot detection in <tt>install.sh</tt>, recognition of <tt>KeyTool.efi</tt> and <tt>KeyTool-signed.efi</tt> as MOK manager utilities, and reporting of Secure Boot status for <i>x</i>86 (IA-32) systems in the rEFInd information screen. Filesystem detection is improved (again), and XFS has been added as a known filesystem. Detection of FreeBSD's BIOS-mode boot loader is improved, which should give more Mac users the right OS icon when booting FreeBSD in BIOS mode. A bug in <tt>install.sh</tt> that caused inappropriate installation to the filename <tt>bootx64.efi</tt> or <tt>bootia32.efi</tt>, and failure to update the computer's boot list, has been squashed. Finally, I'm <i><b>deprecating</b></i> the use of <tt>fs<tt class="variable">x</tt>:</tt> notation for referring to filesystems. The numbering of filesystems is simply unreliable, and better alternatives (the use of partition GUIDs, partition names, and filesystem names) have been added in previous releases. The <tt>fs<tt class="variable">x</tt>:</tt> code remains in rEFInd, and if it's working for you, you can continue to use it; but sooner or later I'll remove that code, so you're advised to change your manual boot stanzas and other options that use it before that happens.</li>

 
 <li><b>0.8.6 (2/8/2015)</b>&mdash;Most (but not all) of this release's changes focus on Windows dual-booting and Mac-specific issues. There's a new Windows 8 icon, which is now used by default as the Windows icon, although the old icon remains available and is used for Windows XP and earlier boots on Macs. If the NTFS driver is loaded, rEFInd will now exclude non-bootable NTFS volumes from the Mac boot list (this change does not affect UEFI-based PCs). A bug that caused misidentification of whole disks and NTFS volumes as being FAT has been fixed (again, this problem affected Macs, not PCs). A couple of Mac-specific <tt>install.sh</tt> bugs have been fixed, resulting in more reliable identification of the ESP and of the installation directory. Previous versions ignored a volume name of "HFS+ volume" because that name was produced by earlier versions of the rEFInd HFS+ driver for all HFS+ volumes; but the current HFS+ driver produces a real volume name, so I've removed that special case from the code. I've removed the r472 rEFIt commit, introduced in 0.8.5, because it was causing some BMP files to fail to load. Finally, the <tt>hideui</tt> token in <tt>refind.conf</tt> now accepts a value of <tt>badges</tt>, which has the effect of hiding the disk-type badges associated with OS launch icons.</li>
 
 
 <li><b>0.8.6 (2/8/2015)</b>&mdash;Most (but not all) of this release's changes focus on Windows dual-booting and Mac-specific issues. There's a new Windows 8 icon, which is now used by default as the Windows icon, although the old icon remains available and is used for Windows XP and earlier boots on Macs. If the NTFS driver is loaded, rEFInd will now exclude non-bootable NTFS volumes from the Mac boot list (this change does not affect UEFI-based PCs). A bug that caused misidentification of whole disks and NTFS volumes as being FAT has been fixed (again, this problem affected Macs, not PCs). A couple of Mac-specific <tt>install.sh</tt> bugs have been fixed, resulting in more reliable identification of the ESP and of the installation directory. Previous versions ignored a volume name of "HFS+ volume" because that name was produced by earlier versions of the rEFInd HFS+ driver for all HFS+ volumes; but the current HFS+ driver produces a real volume name, so I've removed that special case from the code. I've removed the r472 rEFIt commit, introduced in 0.8.5, because it was causing some BMP files to fail to load. Finally, the <tt>hideui</tt> token in <tt>refind.conf</tt> now accepts a value of <tt>badges</tt>, which has the effect of hiding the disk-type badges associated with OS launch icons.</li>
 

diff --git a/filesystems/fsw_efi.c b/filesystems/fsw_efi.c
index d92554be596186ceeb5db2d5e9b85d76d4dcbd91..dd0c395498d20c80cb0a439ff183190bc5552afc 100644 (file)
--- a/filesystems/fsw_efi.c
+++ b/filesystems/fsw_efi.c
@@ -78,7 +78,7 @@ EFI_GUID gEfiFileSystemVolumeLabelInfoIdGuid = EFI_FILE_SYSTEM_VOLUME_LABEL_INFO
 /** Helper macro for stringification. */
 #define FSW_EFI_STRINGIFY(x) #x
 /** Expands to the EFI driver name given the file system type name. */
 /** Helper macro for stringification. */
 #define FSW_EFI_STRINGIFY(x) #x
 /** Expands to the EFI driver name given the file system type name. */

-#define FSW_EFI_DRIVER_NAME(t) L"rEFInd 0.8.5 " FSW_EFI_STRINGIFY(t) L" File System Driver"
+#define FSW_EFI_DRIVER_NAME(t) L"rEFInd 0.8.7 " FSW_EFI_STRINGIFY(t) L" File System Driver"

 
 // function prototypes
 
 
 // function prototypes
 

diff --git a/gptsync/gptsync.h b/gptsync/gptsync.h
index 3ea9675316b6d30bcb83e972cc5c33e630f55fbd..b9bf46e356039a362fe66fee3af4f2449cee0717 100644 (file)
--- a/gptsync/gptsync.h
+++ b/gptsync/gptsync.h
@@ -35,7 +35,7 @@
  */
 /* Changes copyright (c) 2013 Roderick W. Smith */
 
  */
 /* Changes copyright (c) 2013 Roderick W. Smith */
 

-#define VERSION L"0.8.5"
+#define VERSION L"0.8.7"

 
 //
 // config
 
 //
 // config

diff --git a/install.sh b/install.sh
index ccf7d810736d9b739b7dd8766030b60f30bfe15a..eca87776e0917d1d47170097954028a9ac77cf16 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -36,7 +36,8 @@
 # Revision history:
 #
 # 0.8.7   -- Better detection of Secure Boot mode & fixed errors when copying
 # Revision history:
 #
 # 0.8.7   -- Better detection of Secure Boot mode & fixed errors when copying

-#            Shim & MokManager files over themselves.
+#            Shim & MokManager files over themselves; fixed bug that caused
+#            inappropriate installation to EFI/BOOT/bootx64.efi

 # 0.8.6   -- Fixed bugs that caused misidentification of ESP on disks with
 #            partition numbers over 10 on OS X and misidentification of mount
 #            point if already-mounted ESP had space in path.
 # 0.8.6   -- Fixed bugs that caused misidentification of ESP on disks with
 #            partition numbers over 10 on OS X and misidentification of mount
 #            point if already-mounted ESP had space in path.


@@ -201,6 +202,7 @@ CheckForFiles() {
       exit 1
    fi
 
       exit 1
    fi
 

+   echo "ShimSource is $ShimSource"

    if [[ "$ShimSource" != "none" ]] ; then
       if [[ -f "$ShimSource" ]] ; then
          if [[ $ShimType == "shimx64.efi" || $ShimType == "shim.efi" ]] ; then
    if [[ "$ShimSource" != "none" ]] ; then
       if [[ -f "$ShimSource" ]] ; then
          if [[ $ShimType == "shimx64.efi" || $ShimType == "shim.efi" ]] ; then


@@ -225,17 +227,17 @@ CheckForFiles() {
 # Helper for CopyRefindFiles; copies shim files (including MokManager, if it's
 # available) to target.
 CopyShimFiles() {
 # Helper for CopyRefindFiles; copies shim files (including MokManager, if it's
 # available) to target.
 CopyShimFiles() {

-   local inode1=`ls -i "$ShimSource" | cut -f 1 -d " "`
-   local inode2=`ls -i "$InstallDir/$TargetDir/$TargetShim" | cut -f 1 -d " "`
+   local inode1=`ls -i "$ShimSource" 2> /dev/null | cut -f 1 -d " "`
+   local inode2=`ls -i "$InstallDir/$TargetDir/$TargetShim" 2> /dev/null | cut -f 1 -d " "`

    if [[ $inode1 != $inode2 ]] ; then
       cp -fb "$ShimSource" "$InstallDir/$TargetDir/$TargetShim"
       if [[ $? != 0 ]] ; then
          Problems=1
       fi
    fi
    if [[ $inode1 != $inode2 ]] ; then
       cp -fb "$ShimSource" "$InstallDir/$TargetDir/$TargetShim"
       if [[ $? != 0 ]] ; then
          Problems=1
       fi
    fi

-   inode1 = `ls -i "$MokManagerSource" | cut -f 1 -d " "`
+   inode1=`ls -i "$MokManagerSource" 2> /dev/null | cut -f 1 -d " "`

    local TargetMMName=`basename $MokManagerSource`
    local TargetMMName=`basename $MokManagerSource`

-   inode2 = `ls -i "$InstallDir/$TargetDir/$TargetShim/$TargetMMName" | cut -f 1 -d " "`
+   inode2=`ls -i "$InstallDir/$TargetDir/$TargetMMName" 2> /dev/null | cut -f 1 -d " "`

    if [[ $inode1 != $inode2 ]] ; then
       if [[ -f "$MokManagerSource" ]] ; then
          cp -fb "$MokManagerSource" "$InstallDir/$TargetDir/"
    if [[ $inode1 != $inode2 ]] ; then
       if [[ -f "$MokManagerSource" ]] ; then
          cp -fb "$MokManagerSource" "$InstallDir/$TargetDir/"


@@ -307,17 +309,17 @@ SetVarsForMsBoot() {
 DetermineTargetDir() {
    Upgrade=0
 
 DetermineTargetDir() {
    Upgrade=0
 

-   if [[ -f $InstallDir/EFI/BOOT/refind.conf ]] ; then
+   if [[ -f $InstallDir/EFI/BOOT/refind.conf && ! -f $InstallDir/EFI/refind/refind.conf ]] ; then

       SetVarsForBoot
       Upgrade=1
    fi
       SetVarsForBoot
       Upgrade=1
    fi

-   if [[ -f $InstallDir/EFI/Microsoft/Boot/refind.conf ]] ; then
+   if [[ -f $InstallDir/EFI/Microsoft/Boot/refind.conf && ! -f $InstallDir/EFI/refind/refind.conf ]] ; then

       SetVarsForMsBoot
       Upgrade=1
    fi
       SetVarsForMsBoot
       Upgrade=1
    fi

-   if [[ -f $InstallDir/EFI/refind/refind.conf ]] ; then
+   if [[ -f $InstallDir/EFI/refind/refind.conf && foofoo ]] ; then

       TargetDir="/EFI/refind"
       TargetDir="/EFI/refind"

-      if [[ "$OSName" == 'Darwin' ]] ; then
+      if [[ $ShimSource == "none" ]] ; then

          TargetX64="refind_x64.efi"
          TargetIA32="refind_ia32.efi"
       fi
          TargetX64="refind_x64.efi"
          TargetIA32="refind_ia32.efi"
       fi


@@ -655,7 +657,7 @@ SetupMacHfs() {
         <key>ProductName</key>
         <string>rEFInd</string>
         <key>ProductVersion</key>
         <key>ProductName</key>
         <string>rEFInd</string>
         <key>ProductVersion</key>

-        <string>0.8.6</string>
+        <string>0.8.7</string>

 </dict>
 </plist>
 ENDOFHERE
 </dict>
 </plist>
 ENDOFHERE

diff --git a/refind.spec b/refind.spec
index 76d95333bb3094bcf344348f1bf95d32315a9c74..aa889b1638d48e14cf6e53c97ace86880aab400b 100644 (file)
--- a/refind.spec
+++ b/refind.spec
@@ -1,6 +1,6 @@
 Summary: EFI boot manager software
 Name: refind
 Summary: EFI boot manager software
 Name: refind

-Version: 0.8.6.1
+Version: 0.8.7

 Release: 1%{?dist}
 Summary: EFI boot manager software
 License: GPLv3
 Release: 1%{?dist}
 Summary: EFI boot manager software
 License: GPLv3


@@ -163,6 +163,8 @@ fi
 # wiping out the just-updated files.
 
 %changelog
 # wiping out the just-updated files.
 
 %changelog

+* Sun Mar 1 2015 R Smith <rodsmith@rodsbooks.com> - 0.8.7
+- Updated spec file for 0.8.7

 * Sun Feb 8 2015 R Smith <rodsmith@rodsbooks.com> - 0.8.6
 - Updated spec file for 0.8.6
 * Sun Feb 2 2015 R Smith <rodsmith@rodsbooks.com> - 0.8.5
 * Sun Feb 8 2015 R Smith <rodsmith@rodsbooks.com> - 0.8.6
 - Updated spec file for 0.8.6
 * Sun Feb 2 2015 R Smith <rodsmith@rodsbooks.com> - 0.8.5

diff --git a/refind/main.c b/refind/main.c
index fe3ea7bceaf205d1e04054a9ad5aa426f6112e58..4c8bce1cf0a0061568f34419fbc0b776758cd198 100644 (file)
--- a/refind/main.c
+++ b/refind/main.c
@@ -166,7 +166,7 @@ static VOID AboutrEFInd(VOID)
 
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
 
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);

-        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.6.7");
+        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.7");

         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2015 Roderick W. Smith");
         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2015 Roderick W. Smith");