From: srs5694 Date: Fri, 27 Apr 2012 19:14:41 +0000 (-0400) Subject: 0.3.1 release. Fixed bug that caused bogus error message on Macs. X-Git-Url: https://code.delx.au/refind/commitdiff_plain/2f2310b6faef9a3a2161dd7473be056d2807ce48 0.3.1 release. Fixed bug that caused bogus error message on Macs. --- diff --git a/NEWS.txt b/NEWS.txt index 6519380..8805b75 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,6 +1,9 @@ -0.3.1 (?/??/2012): +0.3.1 (4/27/2012): ------------------ +- Fixed bug that caused spurious "Unsupported while scanning the root + directory" messages under some conitions on Macs. + - Modified loader scanning code to sort boot loader entries within a directory by modification time, so that the most recently-modified loader is first among those in a given directory. Thus, if you specify a diff --git a/docs/refind/bootmode.html b/docs/refind/bootmode.html index f7478e1..eaef3d4 100644 --- a/docs/refind/bootmode.html +++ b/docs/refind/bootmode.html @@ -14,7 +14,8 @@

by Roderick W. Smith, rodsmith@rodsbooks.com

Originally written: 3/14/2012; last Web page update: 4/22/2012, referencing rEFInd 0.3.0

Originally written: 3/14/2012; last Web page update: +4/27/2012, referencing rEFInd 0.3.1

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!

diff --git a/docs/refind/configfile.html b/docs/refind/configfile.html index 0e736dc..35cacb6 100644 --- a/docs/refind/configfile.html +++ b/docs/refind/configfile.html @@ -14,7 +14,8 @@

by Roderick W. Smith, rodsmith@rodsbooks.com

Originally written: 3/14/2012; last Web page update: 4/22/2012, referencing rEFInd 0.3.0

Originally written: 3/14/2012; last Web page update: +4/27/2012, referencing rEFInd 0.3.1

@@ -109,7 +110,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

You can place a boot loader in a directory with a name that matches one of rEFInd's standard icons, which take names of the form os_name.icns. To use this icon, you would place the boot loader in the directory called name.

You can name an icon file after your boot loader, but with an extension of .icns. For instance, if you're using loader.efi, you would name the icon file loader.icns. These icon files should be 128x128 images in Apple's ICNS format. You can create such files easily in OS X or convert PNG files to ICNS format with libicns. Note that the scan_all_linux_kernels option can cause loader-specific icon files for Linux kernels (but not other loaders) to be improperly assigned loader tags, so if you want to use this option, you should not also assign your kernels custom icons in this way.

You can name an icon file after your boot loader, but with an extension of .icns. For instance, if you're using loader.efi, you would name the icon file loader.icns. (If you use the scan_all_linux_kernels option, you can give an icon for a Linux kernel without a .efi extension a name based on the kernel name but with a .icns extension—for instance, bzImage-3.3.2.icns will serve as the icon for the bzImage-3.3.2 kernel.) These icon files should be 128x128 images in Apple's ICNS format. You can create such files easily in OS X or convert PNG files to ICNS format with libicns.

If you're booting OS X from its standard boot loader, or if you place a boot loader file in the root directory of a partition, you can create a file called .VolumeIcon.icns that holds an icon file. OS X uses this file for its volume icons, so rEFInd picks up these icons automatically, provided they include 128x128 bitmaps.

@@ -195,7 +196,7 @@ timeout 20 scan_all_linux_kernels None - When set, causes rEFInd to add Linux kernels (files with names that begin with vmlinuz or bzImage) to the list of EFI boot loaders, even if they lack .efi filename extensions. The hope is that this will simplify use of rEFInd on distributions that provide kernels with EFI stub loader support but that don't give those kernels names that end in .efi. Of course, the kernels must still be stored on a filesystem that rEFInd can read, and in a directory that it scans. (Drivers and the also_scan_dirs options can help with those issues.) Note that this option can cause unwanted files to be improperly detected and given loader tags, such as older kernels without EFI stub loader support and .icns files used to give kernels unique icons. For this reason, it's disabled by default. + When set, causes rEFInd to add Linux kernels (files with names that begin with vmlinuz or bzImage) to the list of EFI boot loaders, even if they lack .efi filename extensions. The hope is that this will simplify use of rEFInd on distributions that provide kernels with EFI stub loader support but that don't give those kernels names that end in .efi. Of course, the kernels must still be stored on a filesystem that rEFInd can read, and in a directory that it scans. (Drivers and the also_scan_dirs options can help with those issues.) Note that this option can cause unwanted files to be improperly detected and given loader tags, such as older kernels without EFI stub loader support. For this reason, it's disabled by default. default_selection diff --git a/docs/refind/drivers.html b/docs/refind/drivers.html index 60dead3..6d1a4be 100644 --- a/docs/refind/drivers.html +++ b/docs/refind/drivers.html @@ -14,7 +14,8 @@

by Roderick W. Smith, rodsmith@rodsbooks.com

Originally written: 4/19/2012; last Web page update: 4/22/2012, referencing rEFInd 0.3.0

Originally written: 4/19/2012; last Web page update: +4/27/2012, referencing rEFInd 0.3.1

diff --git a/docs/refind/features.html b/docs/refind/features.html index 3d3fb05..0896f20 100644 --- a/docs/refind/features.html +++ b/docs/refind/features.html @@ -14,7 +14,8 @@

by Roderick W. Smith, rodsmith@rodsbooks.com

Originally written: 3/14/2012; last Web page update: 4/22/2012, referencing rEFInd 0.3.0

Originally written: 3/14/2012; last Web page update: +4/27/2012, referencing rEFInd 0.3.1

diff --git a/docs/refind/getting.html b/docs/refind/getting.html index da91a3f..a7212cf 100644 --- a/docs/refind/getting.html +++ b/docs/refind/getting.html @@ -14,7 +14,8 @@

by Roderick W. Smith, rodsmith@rodsbooks.com

Originally written: 3/14/2012; last Web page update: 4/22/2012, referencing rEFInd 0.3.0

Originally written: 3/14/2012; last Web page update: +4/27/2012, referencing rEFInd 0.3.1

@@ -96,7 +97,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

A +
A source code zip file—This is useful if you want to compile the software locally. Note that I use Linux with the GNU-EFI development @@ -104,16 +105,18 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com
that toolchain is theoretically possible, but I've not attempted it.

-
A - binary zip file—Download this if you want to install rEFInd on - an x86 or x86-64 computer and have no need to test rEFInd - first by booting it on an optical disc. This zip file package includes both - x86 (aka IA32) and x86-64 (aka x64, AMD64, or EM64T) - versions of rEFInd. Which you install depends on your architecture, as - described on the Installing rEFInd page.
+
A + binary zip file—Download this if you want to install + rEFInd on an x86 or x86-64 computer and have no need to + test rEFInd first by booting it on an optical disc. This zip file + package includes both x86 (aka IA32) and x86-64 (aka + x64, AMD64, or EM64T) versions of rEFInd. Which you install + depends on your architecture, as described on the Installing rEFInd page.

A + href="http://sourceforge.net/projects/refind/files/0.3.1/refind-cd-0.3.1.zip/download">A CD-R image file—This download contains the same files as the zip file, but you can burn it to a CD-R to test rEFInd without installing it first. (It boots on UEFI PCs, but fails on some older diff --git a/docs/refind/index.html b/docs/refind/index.html index be0e0d9..ccacfa4 100644 --- a/docs/refind/index.html +++ b/docs/refind/index.html @@ -14,7 +14,7 @@
by Roderick W. Smith, rodsmith@rodsbooks.com
-
Originally written: 3/14/2012; last Web page update: 4/22/2012, referencing rEFInd 0.3.0
+
Originally written: 3/14/2012; last Web page update: 4/27/2012, referencing rEFInd 0.3.1

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!
diff --git a/docs/refind/installing.html b/docs/refind/installing.html index ee18e52..1ac51b7 100644 --- a/docs/refind/installing.html +++ b/docs/refind/installing.html @@ -11,10 +11,11 @@
The rEFInd Boot Manager:
Installing rEFInd
-
by Roderick W. Smith, by Roderick W. Smith, rodsmith@rodsbooks.com
-
Originally written: 3/14/2012; last Web page update: 4/24/2012, referencing rEFInd 0.3.0
+
Originally written: 3/14/2012; last Web page update: +4/27/2012, referencing rEFInd 0.3.1

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!
diff --git a/docs/refind/linux.html b/docs/refind/linux.html index a0e985c..7680101 100644 --- a/docs/refind/linux.html +++ b/docs/refind/linux.html @@ -14,7 +14,8 @@
by Roderick W. Smith, rodsmith@rodsbooks.com
-
Originally written: 3/19/2012; last Web page update: 4/22/2012, referencing rEFInd 0.3.0
+
Originally written: 3/19/2012; last Web page update: +4/27/2012, referencing rEFInd 0.3.1

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!
@@ -227,7 +228,7 @@ total 17943
Ordinarily, a kernel booted in this way must reside on the ESP, or at least on another FAT partition. On a Macintosh, though, you can use HFS+ to house your kernel files. In fact, that may be necessary; my Mac Mini hangs when I try to boot a Linux kernel via an EFI stub loader from the computer's ESP, but it works fine when booting from an HFS+ partition. If you use EFI drivers, though, you can place your kernel on any filesystem for which an EFI driver exists. This list is currently rather limited (ext2fs/ext3fs, ReiserFS, ISO-9660, and HFS+), but even just one or two options might help a lot if you've got an undersized ESP or if copying your kernel file to the ESP is a hassle you'd rather avoid.
-
Beginning with version 0.3.1, rEFInd sorts boot loader entries within each directory by time stamp, so that the most recent entry comes first. Thus, if you specify a directory name (or a volume label, for loaders stored in a volume's root directory) as the default_selection, rEFInd will make the most recent loader in the directory the default. This can obviate the need to adjust this configuration parameter when you add a new kernel; chances are you want the most recently-added kernel to be the default, and rEFInd makes it so when you set the default_selection in this way. If you don't want the latest kernel to become the default, you can use touch to give the desired kernel (or other boot loader) in the directory a more recent time stamp, or you can set default_selection to a value that uniquely identifies your desired default loader.
+
Beginning with version 0.3.1, rEFInd sorts boot loader entries within each directory by time stamp, so that the most recent entry comes first. Thus, if you specify a directory name (or a volume label, for loaders stored in a volume's root directory) as the default_selection, rEFInd will make the most recent loader in the directory the default. This can obviate the need to adjust this configuration parameter when you add a new kernel; chances are you want the most recently-added kernel to be the default, and rEFInd makes it so when you set the default_selection in this way. If you don't want the latest kernel to become the default, you can use touch to give the desired kernel (or other boot loader) in the directory a more recent time stamp, or you can set default_selection to a value that uniquely identifies your desired default loader. One caveat you should keep in mind is that the EFI and Windows interpret the hardware clock as local time, whereas Mac OS X uses Coordinated Universal Time (UTC). Linux can work either way. Thus, time stamps for boot loaders can be skewed by several hours depending on the environment in which they were created or last modified.

Tip for distribution maintainers: If you maintain an EFI/distname directory for your kernels, you can place your version of rEFInd in a directory called EFI/distname/refind. This will avoid collisions with duplicate rEFInd installations from other distributions.
diff --git a/docs/refind/revisions.html b/docs/refind/revisions.html index 8b53c10..943f0e1 100644 --- a/docs/refind/revisions.html +++ b/docs/refind/revisions.html @@ -14,7 +14,7 @@
by Roderick W. Smith, rodsmith@rodsbooks.com
-
Last Web page update: 4/22/2012
+
Last Web page update: 4/27/2012

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!
@@ -93,6 +93,8 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

+
0.3.1 (4/27/2012)—You'll find a few minor enhancements and bug fixes in this version, none of which affect the configuration files. rEFInd now sorts its boot loader entries within each directory by date, with the newest items first. The intent is that you can specify a directory name as the default_selection and the most recent boot loader in that directory will become the default. This may obviate the need to adjust the default after adding a new Linux kernel with EFI stub loader support. I've also improved the handling of .icns files for Linux kernels that lack .efi extensions; loader-specific icons for these kernels should now take the name of the kernel plus .icns—for instance, vmlinuz-0.3.2.icns for vmlinuz-0.3.2. rEFInd also now hides all .icns files from the boot loader list. Finally, this version fixes a bug, introduced in version 0.3.0, that could cause spurious Unsupported while scanning the root directory errors under some conditions on Macs.
+
0.3.0 (4/22/2012)—This version marks the official transition from alpha to beta status for rEFInd. This isn't because of any important objective milestone being passed; it's just that rEFInd has been used by many people who have reported no show-stopping bugs, so I'm now confident that rEFInd is stable enough for general use. That's not to say it's perfect; it still has numerous known bugs and limitations. That's why it's still beta. To get down to specifics, this version adds two new configuration file tokens: resolution, which sets the screen resolution; and scan_all_linux_kernels, which adds Linux kernel files to the boot loader list even if they lack .efi filename extensions. See the Configuring the Boot Manager page for details on these new options. I've also fixed some bugs: One that sometimes caused Macs to crash when returning from the EFI shell or other programs; another that caused rEFInd to fail to scan filesystems if the filesystem driver didn't return a volume name; and a third that caused rEFInd to fail to detect boot loaders depending on the case of the filename on some EFIs (this is really a workaround for an EFI implementation bug). The first of these is a very tentative fix and it could have negative effects on some systems (non-Mac EFI 1.x systems or Macs that weren't affected by the bug in other recent releases), so be sure to contact me if rEFInd crashes or otherwise misbehaves after you use an EFI shell.

0.2.7 (4/19/2012)—I've added two new tokens to the refind.conf file, with associated new functionality. The new scan_driver_dirs option tells rEFInd where to scan for EFI drivers, in addition to the default of the drivers subdirectory of the rEFInd installation directory. For more on EFI drivers, see Using EFI Drivers. Note that previous versions of rEFInd couldn't load drivers at all, although they could make use of hardware and filesystems activated by drivers loaded before rEFInd launched. The second new token is also_scan_dirs, which adds arbitrary directories to the list that rEFInd scans for boot loaders. (Without this option, rEFInd scans each volume's boot directory and every subdirectory of the /EFI directory, with the exception of /EFI/tools and rEFInd's own directory.) This version also fixes a minor bug that caused rEFInd to sometimes include itself in the list of OS options. Finally, if you build rEFInd yourself, you should be aware that it now requires a newer version of the GNU-EFI library than it required in the past. See the BUILDING.txt file, included in the source code package, for details.
diff --git a/docs/refind/themes.html b/docs/refind/themes.html index 2049bba..ab5be39 100644 --- a/docs/refind/themes.html +++ b/docs/refind/themes.html @@ -14,7 +14,8 @@
by Roderick W. Smith, rodsmith@rodsbooks.com
-
Originally written: 4/19/2012; last Web page update: 4/22/2012, referencing rEFInd 0.3.0
+
Originally written: 4/19/2012; last Web page update: +4/27/2012, referencing rEFInd 0.3.1

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!
diff --git a/docs/refind/todo.html b/docs/refind/todo.html index a6e06bf..2e92da5 100644 --- a/docs/refind/todo.html +++ b/docs/refind/todo.html @@ -14,7 +14,8 @@
by Roderick W. Smith, rodsmith@rodsbooks.com
-
Originally written: 3/14/2012; last Web page update: 4/22/2012, referencing rEFInd 0.3.0
+
Originally written: 3/14/2012; last Web page update: +4/27/2012, referencing rEFInd 0.3.1

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!
@@ -218,6 +219,8 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com

I'd like to find a way to have rEFInd re-scan removable media when they're inserted.
+
Enabling users to eject removable media would be useful.
+
I'd like to give the user the ability to set custom options on a per-boot basis, similar to what's possible in GRUB.
diff --git a/docs/refind/using.html b/docs/refind/using.html index d9f527a..a8b72ac 100644 --- a/docs/refind/using.html +++ b/docs/refind/using.html @@ -14,7 +14,8 @@
by Roderick W. Smith, rodsmith@rodsbooks.com
-
Originally written: 3/14/2012; last Web page update: 4/22/2012, referencing rEFInd 0.3.0
+
Originally written: 3/14/2012; last Web page update: +4/27/2012, referencing rEFInd 0.3.1

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!
diff --git a/refind/lib.c b/refind/lib.c index 333e0c1..fde385f 100644 --- a/refind/lib.c +++ b/refind/lib.c @@ -232,7 +232,7 @@ VOID AddListElement(IN OUT VOID ***ListPtr, IN OUT UINTN *ElementCount, IN VOID VOID FreeList(IN OUT VOID ***ListPtr, IN OUT UINTN *ElementCount) { UINTN i; - + if (*ElementCount > 0) { for (i = 0; i < *ElementCount; i++) { // TODO: call a user-provided routine for each element here @@ -265,9 +265,9 @@ VOID ExtractLegacyLoaderPaths(EFI_DEVICE_PATH **PathList, UINTN MaxPaths, EFI_DE EFI_LOADED_IMAGE *LoadedImage; EFI_DEVICE_PATH *DevicePath; BOOLEAN Seen; - + MaxPaths--; // leave space for the terminating NULL pointer - + // get all LoadedImage handles Status = LibLocateHandle(ByProtocol, &LoadedImageProtocol, NULL, &HandleCount, &Handles); @@ -281,19 +281,19 @@ VOID ExtractLegacyLoaderPaths(EFI_DEVICE_PATH **PathList, UINTN MaxPaths, EFI_DE } for (HandleIndex = 0; HandleIndex < HandleCount && PathCount < MaxPaths; HandleIndex++) { Handle = Handles[HandleIndex]; - + Status = refit_call3_wrapper(BS->HandleProtocol, Handle, &LoadedImageProtocol, (VOID **) &LoadedImage); if (EFI_ERROR(Status)) continue; // This can only happen if the firmware scewed up, ignore it. - + Status = refit_call3_wrapper(BS->HandleProtocol, LoadedImage->DeviceHandle, &DevicePathProtocol, (VOID **) &DevicePath); if (EFI_ERROR(Status)) continue; // This happens, ignore it. - + // Only grab memory range nodes if (DevicePathType(DevicePath) != HARDWARE_DEVICE_PATH || DevicePathSubType(DevicePath) != HW_MEMMAP_DP) continue; - + // Check if we have this device path in the list already // WARNING: This assumes the first node in the device path is unique! Seen = FALSE; @@ -346,12 +346,12 @@ static VOID ScanVolumeBootcode(IN OUT REFIT_VOLUME *Volume, OUT BOOLEAN *Bootabl Volume->BlockIO, Volume->BlockIO->Media->MediaId, Volume->BlockIOOffset, SECTOR_SIZE, SectorBuffer); if (!EFI_ERROR(Status)) { - + if (*((UINT16 *)(SectorBuffer + 510)) == 0xaa55 && SectorBuffer[0] != 0) { *Bootable = TRUE; Volume->HasBootCode = TRUE; } - + // detect specific boot codes if (CompareMem(SectorBuffer + 2, "LILO", 4) == 0 || CompareMem(SectorBuffer + 6, "LILO", 4) == 0 || @@ -360,12 +360,12 @@ static VOID ScanVolumeBootcode(IN OUT REFIT_VOLUME *Volume, OUT BOOLEAN *Bootabl Volume->HasBootCode = TRUE; Volume->OSIconName = L"linux"; Volume->OSName = L"Linux"; - + } else if (FindMem(SectorBuffer, 512, "Geom\0Hard Disk\0Read\0 Error", 26) >= 0) { // GRUB Volume->HasBootCode = TRUE; Volume->OSIconName = L"grub,linux"; Volume->OSName = L"Linux"; - + } else if ((*((UINT32 *)(SectorBuffer + 502)) == 0 && *((UINT32 *)(SectorBuffer + 506)) == 50000 && *((UINT16 *)(SectorBuffer + 510)) == 0xaa55) || @@ -373,51 +373,51 @@ static VOID ScanVolumeBootcode(IN OUT REFIT_VOLUME *Volume, OUT BOOLEAN *Bootabl Volume->HasBootCode = TRUE; Volume->OSIconName = L"freebsd"; Volume->OSName = L"FreeBSD"; - + } else if (FindMem(SectorBuffer, 512, "!Loading", 8) >= 0 || FindMem(SectorBuffer, SECTOR_SIZE, "/cdboot\0/CDBOOT\0", 16) >= 0) { Volume->HasBootCode = TRUE; Volume->OSIconName = L"openbsd"; Volume->OSName = L"OpenBSD"; - + } else if (FindMem(SectorBuffer, 512, "Not a bootxx image", 18) >= 0 || *((UINT32 *)(SectorBuffer + 1028)) == 0x7886b6d1) { Volume->HasBootCode = TRUE; Volume->OSIconName = L"netbsd"; Volume->OSName = L"NetBSD"; - + } else if (FindMem(SectorBuffer, SECTOR_SIZE, "NTLDR", 5) >= 0) { Volume->HasBootCode = TRUE; Volume->OSIconName = L"win"; Volume->OSName = L"Windows"; - + } else if (FindMem(SectorBuffer, SECTOR_SIZE, "BOOTMGR", 7) >= 0) { Volume->HasBootCode = TRUE; Volume->OSIconName = L"winvista,win"; Volume->OSName = L"Windows"; - + } else if (FindMem(SectorBuffer, 512, "CPUBOOT SYS", 11) >= 0 || FindMem(SectorBuffer, 512, "KERNEL SYS", 11) >= 0) { Volume->HasBootCode = TRUE; Volume->OSIconName = L"freedos"; Volume->OSName = L"FreeDOS"; - + } else if (FindMem(SectorBuffer, 512, "OS2LDR", 6) >= 0 || FindMem(SectorBuffer, 512, "OS2BOOT", 7) >= 0) { Volume->HasBootCode = TRUE; Volume->OSIconName = L"ecomstation"; Volume->OSName = L"eComStation"; - + } else if (FindMem(SectorBuffer, 512, "Be Boot Loader", 14) >= 0) { Volume->HasBootCode = TRUE; Volume->OSIconName = L"beos"; Volume->OSName = L"BeOS"; - + } else if (FindMem(SectorBuffer, 512, "yT Boot Loader", 14) >= 0) { Volume->HasBootCode = TRUE; Volume->OSIconName = L"zeta,beos"; Volume->OSName = L"ZETA"; - + } else if (FindMem(SectorBuffer, 512, "\x04" "beos\x06" "system\x05" "zbeos", 18) >= 0 || FindMem(SectorBuffer, 512, "\x06" "system\x0c" "haiku_loader", 20) >= 0) { Volume->HasBootCode = TRUE; @@ -425,19 +425,19 @@ static VOID ScanVolumeBootcode(IN OUT REFIT_VOLUME *Volume, OUT BOOLEAN *Bootabl Volume->OSName = L"Haiku"; } - + // NOTE: If you add an operating system with a name that starts with 'W' or 'L', you // need to fix AddLegacyEntry in main.c. - + #if REFIT_DEBUG > 0 Print(L" Result of bootcode detection: %s %s (%s)\n", Volume->HasBootCode ? L"bootable" : L"non-bootable", Volume->OSName, Volume->OSIconName); #endif - + if (FindMem(SectorBuffer, 512, "Non-system disk", 15) >= 0) // dummy FAT boot sector Volume->HasBootCode = FALSE; - + // check for MBR partition table if (*((UINT16 *)(SectorBuffer + 510)) == 0xaa55) { MbrTableFound = FALSE; @@ -968,7 +968,7 @@ BOOLEAN DirIterNext(IN OUT REFIT_DIR_ITER *DirIter, IN UINTN FilterMode, IN CHAR do { DirIter->LastStatus = DirNextEntry(DirIter->DirHandle, &(DirIter->LastFileInfo), FilterMode); if (EFI_ERROR(DirIter->LastStatus)) - return FALSE; + return FALSE; if (DirIter->LastFileInfo == NULL) // end of listing return FALSE; if (FilePattern != NULL) { @@ -982,7 +982,7 @@ BOOLEAN DirIterNext(IN OUT REFIT_DIR_ITER *DirIter, IN UINTN FilterMode, IN CHAR // else continue loop } else break; - } while (KeepGoing); + } while (KeepGoing); *DirEntry = DirIter->LastFileInfo; return TRUE; diff --git a/refind/main.c b/refind/main.c index 21d8aa8..572f36a 100644 --- a/refind/main.c +++ b/refind/main.c @@ -104,7 +104,7 @@ static VOID AboutrEFInd(VOID) { if (AboutMenu.EntryCount == 0) { AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); - AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.3.0.2"); + AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.3.1"); AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer"); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith"); @@ -736,6 +736,7 @@ static VOID ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 *P SPrint(FileName, 255, L"\\%s\\%s", Path, DirEntry->FileName); else SPrint(FileName, 255, L"\\%s", DirEntry->FileName); + CleanUpPathNameSlashes(FileName); NewLoader = AllocateZeroPool(sizeof(struct LOADER_LIST)); if (NewLoader != NULL) { NewLoader->FileName = StrDuplicate(FileName); @@ -792,7 +793,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { } // scan the root directory for EFI executables - ScanLoaderDir(Volume, NULL, MatchPatterns); + ScanLoaderDir(Volume, L"\\", MatchPatterns); // scan subdirectories of the EFI directory (as per the standard) DirIterOpen(Volume->RootDir, L"EFI", &EfiDirIter);

The rEFInd Boot Manager:Installing rEFInd

The rEFInd Boot Manager:
Installing rEFInd