From c50c3d76e4530c0f4afbfcaf72316dfebb4b7fb5 Mon Sep 17 00:00:00 2001
From: srs5694
Date: Sat, 16 Feb 2013 17:38:41 -0500
Subject: [PATCH] Fixed bug that caused icons named after boot loaders to not
be used.
---
NEWS.txt | 5 +++++
docs/refind/getting.html | 18 +++++++++---------
docs/refind/installing.html | 4 ++--
docs/refind/linux.html | 2 +-
refind/main.c | 6 +++---
5 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/NEWS.txt b/NEWS.txt
index ba6d65d..ed90b3f 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,8 @@
+0.6.8 (?/?/2013):
+-----------------
+
+- Fixed bug that caused icons named after boot loaders to not be used.
+
0.6.7 (2/3/2013):
-----------------
diff --git a/docs/refind/getting.html b/docs/refind/getting.html
index 39157d4..5416986 100644
--- a/docs/refind/getting.html
+++ b/docs/refind/getting.html
@@ -1,4 +1,4 @@
-
+F
@@ -15,7 +15,7 @@
href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com
Originally written: 3/14/2012; last Web page update:
-1/26/2013, referencing rEFInd 0.6.6
+2/8/2013, referencing rEFInd 0.6.7
I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
@@ -98,7 +98,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com
- A
+ href="http://sourceforge.net/projects/refind/files/0.6.7/refind-src-0.6.7.zip/download">A
source code zip file—This is useful if you want to compile
the software locally. Note that I use Linux with the TianoCore EFI
@@ -107,7 +107,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com
development tools are also supported.
- A
+ href="http://sourceforge.net/projects/refind/files/0.6.7/refind-bin-0.6.7.zip/download">A
binary zip file—Download this if you want to install
rEFInd and/or its filesystem drivers on an x86 or x86-64
computer and have no need to test rEFInd first by booting it on an
@@ -117,7 +117,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com
href="installing.html">Installing rEFInd page.
- A
+ href="http://sourceforge.net/projects/refind/files/0.6.7/refind-0.6.7-1.x86_64.rpm/download">A
binary RPM file—If you use an RPM-based x86-64
Linux system such as Fedora or openSUSE, you can install the binary RPM
package rather than use the binary zip file. (I don't provide an
@@ -126,13 +126,13 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com
rEFInd page) as part of the installation process. Distribution
maintainers can examine the refind.spec file in the source
package and tweak it to their needs. The source
+ href="http://sourceforge.net/projects/refind/files/0.6.7/refind-0.6.7-1.src.rpm/download">source
RPM file might or might not build on your system as-is; it relies
on assumptions about the locations of the GNU-EFI development
files.
- A
+ href="http://sourceforge.net/projects/refind/files/0.6.7/refind_0.6.7-1_amd64.deb/download">A
binary Debian package—If you use an x86-64 version
of Debian, Ubuntu, Mint, or another Debian-based distribution, you can
install from this package, which was converted from the binary RPM
@@ -154,7 +154,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com
- A
+ href="http://sourceforge.net/projects/refind/files/0.6.7/refind-cd-0.6.7.zip/download">A
CD-R image file—This download contains the same files as
the binary zip file, but you can burn it to a CD-R to test rEFInd
(and its filesystem drivers) without installing it first. (It boots on
@@ -178,7 +178,7 @@ on /dev/sdd. This procedure should work even on a BIOS-booted
computer.
- A
+ href="http://sourceforge.net/projects/refind/files/0.6.7/refind-flashdrive-0.6.7.zip/download">A
USB flash drive image file—Although you can create
your own rEFInd USB flash drive, you may find it easier to download
this version and copy it to your USB drive with dd or some
diff --git a/docs/refind/installing.html b/docs/refind/installing.html
index a6445cf..733f7b6 100644
--- a/docs/refind/installing.html
+++ b/docs/refind/installing.html
@@ -15,7 +15,7 @@
href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com
Originally written: 3/14/2012; last Web page update:
-2/3/2013, referencing rEFInd 0.6.7
+2/11/2013, referencing rEFInd 0.6.7
I'm a technical writer and consultant specializing in Linux technologies. This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!
@@ -520,7 +520,7 @@ $ ioreg -l -p IODeviceTree | grep firmware-abi
- Type xcopy /E refind S:\EFI\refind\ to copy the refind directory tree to the ESP's EFI directory. If you omit the trailing backslash from this command, xcopy will ask if you want to create the refind directory. Tell it to do so.
-- Type cd S: to change to the ESP.
+- Type S: to change to the ESP.
- Type cd EFI\refind to change into the refind subdirectory
diff --git a/docs/refind/linux.html b/docs/refind/linux.html
index 61e5603..0b88e5a 100644
--- a/docs/refind/linux.html
+++ b/docs/refind/linux.html
@@ -138,7 +138,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com
Using the EFI Stub Loader: Three Configuration Options
-The EFI stub loader is basic and reliable, but it requires some setup to use it on some computers. I describe three methods of using it: an easiest method for those with compatible partition and filesystem layouts, a quick test configuration for those without such a layout, and a long-term setup for those without the ideal setup.
+The EFI stub loader is basic and reliable, but it requires some setup to use it on some computers. It also requires that you run a kernel with the same bit width as your EFI. In most cases, this means running a 64-bit kernel, since 32-bit EFI-based computers are so rare. I describe three methods of using the EFI stub loader: an easiest method for those with compatible partition and filesystem layouts, a quick test configuration for those without such a layout, and a long-term setup for those without the ideal setup.
For Those With Foresight or Luck: The Easiest Method
diff --git a/refind/main.c b/refind/main.c
index f0f10df..d115ae2 100644
--- a/refind/main.c
+++ b/refind/main.c
@@ -132,7 +132,7 @@ static VOID AboutrEFInd(VOID)
if (AboutMenu.EntryCount == 0) {
AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
- AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.6.7");
+ AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.6.7.1");
AddMenuInfoLine(&AboutMenu, L"");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith");
@@ -751,9 +751,9 @@ VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, REFIT_VOLUME *Vo
// locate a custom icon for the loader
// Anything found here takes precedence over the "hints" in the OSIconName variable
if (!Entry->me.Image)
- Entry->me.Image = egFindIcon(NoExtension, 128);
+ Entry->me.Image = egLoadIconAnyType(Volume->RootDir, PathOnly, NoExtension, 128);
if (!Entry->me.Image)
- Entry->me.Image = Volume->VolIconImage;
+ Entry->me.Image = egCopyImage(Volume->VolIconImage);
// Begin creating icon "hints" by using last part of directory path leading
// to the loader
--
2.39.2