X-Git-Url: https://code.delx.au/refind/blobdiff_plain/a3dd82017d0be4d3fdca46a722b41b5ff3777139..ec94a3138800973e0308c641c5e1ced7c5f1b7ba:/refind/main.c diff --git a/refind/main.c b/refind/main.c index 4638a62..9e653b4 100644 --- a/refind/main.c +++ b/refind/main.c @@ -34,7 +34,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * Modifications copyright (c) 2012 Roderick W. Smith + * Modifications copyright (c) 2012-2014 Roderick W. Smith * * Modifications distributed under the terms of the GNU General Public * License (GPL) version 3 (GPLv3), a copy of which must be distributed @@ -49,6 +49,7 @@ #include "icns.h" #include "menu.h" #include "mok.h" +#include "gpt.h" #include "security_policy.h" #include "../include/Handle.h" #include "../include/refit_call_wrapper.h" @@ -56,27 +57,60 @@ #include "../include/syslinux_mbr.h" #ifdef __MAKEWITH_GNUEFI +#ifndef EFI_SECURITY_VIOLATION #define EFI_SECURITY_VIOLATION EFIERR (26) -#else +#endif +#endif + #include "../EfiLib/BdsHelper.h" -#endif // __MAKEWITH_GNUEFI +#include "../EfiLib/legacy.h" + +#ifndef EFI_OS_INDICATIONS_BOOT_TO_FW_UI +#define EFI_OS_INDICATIONS_BOOT_TO_FW_UI 0x0000000000000001ULL +#endif + +#ifdef __MAKEWITH_TIANO +#define LibLocateHandle gBS->LocateHandleBuffer +#endif // -// variables +// constants #define MACOSX_LOADER_PATH L"System\\Library\\CoreServices\\boot.efi" #if defined (EFIX64) -#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\EFI\\tools\\shellx64.efi,\\shellx64.efi" +#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\EFI\\tools\\shellx64.efi,\\shell.efi,\\shellx64.efi" +#define GPTSYNC_NAMES L"\\EFI\\tools\\gptsync.efi,\\EFI\\tools\\gptsync_x64.efi" +#define GDISK_NAMES L"\\EFI\\tools\\gdisk.efi,\\EFI\\tools\\gdisk_x64.efi" +#define NETBOOT_NAMES L"\\EFI\\tools\\ipxe.efi" +#define MEMTEST_NAMES L"memtest86.efi,memtest86_x64.efi,memtest86x64.efi,bootx64.efi" #define DRIVER_DIRS L"drivers,drivers_x64" +#define FALLBACK_FULLNAME L"EFI\\BOOT\\bootx64.efi" +#define FALLBACK_BASENAME L"bootx64.efi" +#define EFI_STUB_ARCH 0x8664 #elif defined (EFI32) -#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\EFI\\tools\\shellia32.efi,\\shellia32.efi" +#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\EFI\\tools\\shellia32.efi,\\shell.efi,\\shellia32.efi" +#define GPTSYNC_NAMES L"\\EFI\\tools\\gptsync.efi,\\EFI\\tools\\gptsync_ia32.efi" +#define GDISK_NAMES L"\\EFI\\tools\\gdisk.efi,\\EFI\\tools\\gdisk_ia32.efi" +#define NETBOOT_NAMES L"\\EFI\\tools\\ipxe.efi" +#define MEMTEST_NAMES L"memtest86.efi,memtest86_ia32.efi,memtest86ia32.efi,bootia32.efi" #define DRIVER_DIRS L"drivers,drivers_ia32" +#define FALLBACK_FULLNAME L"EFI\\BOOT\\bootia32.efi" +#define FALLBACK_BASENAME L"bootia32.efi" +#define EFI_STUB_ARCH 0x014c #else -#define SHELL_NAMES L"\\EFI\\tools\\shell.efi" +#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shell.efi" +#define GPTSYNC_NAMES L"\\EFI\\tools\\gptsync.efi" +#define GDISK_NAMES L"\\EFI\\tools\\gdisk.efi" +#define NETBOOT_NAMES L"\\EFI\\tools\\ipxe.efi" +#define MEMTEST_NAMES L"memtest86.efi" #define DRIVER_DIRS L"drivers" +#define FALLBACK_FULLNAME L"EFI\\BOOT\\boot.efi" /* Not really correct */ +#define FALLBACK_BASENAME L"boot.efi" /* Not really correct */ #endif +#define FAT_ARCH 0x0ef1fab9 /* ID for Apple "fat" binary */ -#define MOK_NAMES L"\\EFI\\tools\\MokManager.efi,\\EFI\\redhat\\MokManager.efi,\\EFI\\ubuntu\\MokManager.efi,\\EFI\\suse\\MokManager" +#define IPXE_DISCOVER_NAME L"\\efi\\tools\\ipxe_discover.efi" +#define IPXE_NAME L"\\efi\\tools\\ipxe.efi" // Filename patterns that identify EFI boot loaders. Note that a single case (either L"*.efi" or // L"*.EFI") is fine for most systems; but Gigabyte's buggy Hybrid EFI does a case-sensitive @@ -95,20 +129,33 @@ #define SUBSCREEN_HINT2 L"Insert or F2 to edit options; Esc to return to main menu" #define SUBSCREEN_HINT2_NO_EDITOR L"Esc to return to main menu" +// Load types +#define TYPE_EFI 1 +#define TYPE_LEGACY 2 + static REFIT_MENU_ENTRY MenuEntryAbout = { L"About rEFInd", TAG_ABOUT, 1, 0, 'A', NULL, NULL, NULL }; static REFIT_MENU_ENTRY MenuEntryReset = { L"Reboot Computer", TAG_REBOOT, 1, 0, 'R', NULL, NULL, NULL }; static REFIT_MENU_ENTRY MenuEntryShutdown = { L"Shut Down Computer", TAG_SHUTDOWN, 1, 0, 'U', NULL, NULL, NULL }; -static REFIT_MENU_ENTRY MenuEntryReturn = { L"Return to Main Menu", TAG_RETURN, 0, 0, 0, NULL, NULL, NULL }; +static REFIT_MENU_ENTRY MenuEntryReturn = { L"Return to Main Menu", TAG_RETURN, 1, 0, 0, NULL, NULL, NULL }; static REFIT_MENU_ENTRY MenuEntryExit = { L"Exit rEFInd", TAG_EXIT, 1, 0, 0, NULL, NULL, NULL }; +static REFIT_MENU_ENTRY MenuEntryFirmware = { L"Reboot to Computer Setup Utility", TAG_FIRMWARE, 1, 0, 0, NULL, NULL, NULL }; static REFIT_MENU_SCREEN MainMenu = { L"Main Menu", NULL, 0, NULL, 0, NULL, 0, L"Automatic boot", L"Use arrow keys to move cursor; Enter to boot;", L"Insert or F2 for more options; Esc to refresh" }; static REFIT_MENU_SCREEN AboutMenu = { L"About", NULL, 0, NULL, 0, NULL, 0, NULL, L"Press Enter to return to main menu", L"" }; -REFIT_CONFIG GlobalConfig = { FALSE, FALSE, 0, 0, 0, DONT_CHANGE_TEXT_MODE, 20, 0, 0, GRAPHICS_FOR_OSX, LEGACY_TYPE_MAC, 0, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - {TAG_SHELL, TAG_APPLE_RECOVERY, TAG_MOK_TOOL, TAG_ABOUT, TAG_SHUTDOWN, TAG_REBOOT, 0, 0, 0, 0, 0 }}; +REFIT_CONFIG GlobalConfig = { FALSE, TRUE, FALSE, FALSE, 0, 0, 0, DONT_CHANGE_TEXT_MODE, 20, 0, 0, GRAPHICS_FOR_OSX, LEGACY_TYPE_MAC, + 0, 0, { DEFAULT_BIG_ICON_SIZE / 4, DEFAULT_SMALL_ICON_SIZE, DEFAULT_BIG_ICON_SIZE }, BANNER_NOSCALE, + NULL, NULL, CONFIG_FILE_NAME, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + { TAG_SHELL, TAG_MEMTEST, TAG_GDISK, TAG_APPLE_RECOVERY, TAG_WINDOWS_RECOVERY, TAG_MOK_TOOL, + TAG_ABOUT, TAG_SHUTDOWN, TAG_REBOOT, TAG_FIRMWARE, 0, 0, 0, 0, 0, 0, 0, 0 } + }; + +EFI_GUID GlobalGuid = EFI_GLOBAL_VARIABLE; +EFI_GUID RefindGuid = REFIND_GUID_VALUE; + +GPT_DATA *gPartitions = NULL; // Structure used to hold boot loader filenames and time stamps in // a linked list; used to sort entries within a directory. @@ -124,37 +171,32 @@ struct LOADER_LIST { static VOID AboutrEFInd(VOID) { - CHAR16 *TempStr; // Note: Don't deallocate; moved to menu structure + CHAR16 *FirmwareVendor; if (AboutMenu.EntryCount == 0) { AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); - AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.6.4.6"); + AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.3.4"); AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer"); - AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith"); + AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2014 Roderick W. Smith"); AddMenuInfoLine(&AboutMenu, L"Portions Copyright (c) Intel Corporation and others"); AddMenuInfoLine(&AboutMenu, L"Distributed under the terms of the GNU GPLv3 license"); AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"Running on:"); - TempStr = AllocateZeroPool(256 * sizeof(CHAR16)); - SPrint(TempStr, 255, L" EFI Revision %d.%02d", ST->Hdr.Revision >> 16, ST->Hdr.Revision & ((1 << 16) - 1)); - AddMenuInfoLine(&AboutMenu, TempStr); + AddMenuInfoLine(&AboutMenu, PoolPrint(L" EFI Revision %d.%02d", ST->Hdr.Revision >> 16, ST->Hdr.Revision & ((1 << 16) - 1))); #if defined(EFI32) AddMenuInfoLine(&AboutMenu, L" Platform: x86 (32 bit)"); #elif defined(EFIX64) - TempStr = AllocateZeroPool(256 * sizeof(CHAR16)); - SPrint(TempStr, 255, L" Platform: x86_64 (64 bit); Secure Boot %s", secure_mode() ? L"active" : L"inactive"); - AddMenuInfoLine(&AboutMenu, TempStr); + AddMenuInfoLine(&AboutMenu, PoolPrint(L" Platform: x86_64 (64 bit); Secure Boot %s", + secure_mode() ? L"active" : L"inactive")); #else AddMenuInfoLine(&AboutMenu, L" Platform: unknown"); #endif - TempStr = AllocateZeroPool(256 * sizeof(CHAR16)); - SPrint(TempStr, 255, L" Firmware: %s %d.%02d", - ST->FirmwareVendor, ST->FirmwareRevision >> 16, ST->FirmwareRevision & ((1 << 16) - 1)); - AddMenuInfoLine(&AboutMenu, TempStr); - TempStr = AllocateZeroPool(256 * sizeof(CHAR16)); - SPrint(TempStr, 255, L" Screen Output: %s", egScreenDescription()); - AddMenuInfoLine(&AboutMenu, TempStr); + FirmwareVendor = StrDuplicate(ST->FirmwareVendor); + LimitStringLength(FirmwareVendor, 65); // More than ~65 causes empty info page on 800x600 display + AddMenuInfoLine(&AboutMenu, PoolPrint(L" Firmware: %s %d.%02d", FirmwareVendor, ST->FirmwareRevision >> 16, + ST->FirmwareRevision & ((1 << 16) - 1))); + AddMenuInfoLine(&AboutMenu, PoolPrint(L" Screen Output: %s", egScreenDescription())); AddMenuInfoLine(&AboutMenu, L""); #if defined(__MAKEWITH_GNUEFI) AddMenuInfoLine(&AboutMenu, L"Built with GNU-EFI"); @@ -170,60 +212,132 @@ static VOID AboutrEFInd(VOID) RunMenu(&AboutMenu, NULL); } /* VOID AboutrEFInd() */ +static VOID WarnSecureBootError(CHAR16 *Name, BOOLEAN Verbose) { + if (Name == NULL) + Name = L"the loader"; + + refit_call2_wrapper(ST->ConOut->SetAttribute, ST->ConOut, ATTR_ERROR); + Print(L"Secure Boot validation failure loading %s!\n", Name); + refit_call2_wrapper(ST->ConOut->SetAttribute, ST->ConOut, ATTR_BASIC); + if (Verbose && secure_mode()) { + Print(L"\nThis computer is configured with Secure Boot active, but\n%s has failed validation.\n", Name); + Print(L"\nYou can:\n * Launch another boot loader\n"); + Print(L" * Disable Secure Boot in your firmware\n"); + Print(L" * Sign %s with a machine owner key (MOK)\n", Name); + Print(L" * Use a MOK utility (often present on the second row) to add a MOK with which\n"); + Print(L" %s has already been signed.\n", Name); + Print(L" * Use a MOK utility to register %s (\"enroll its hash\") without\n", Name); + Print(L" signing it.\n"); + Print(L"\nSee http://www.rodsbooks.com/refind/secureboot.html for more information\n"); + PauseForKey(); + } // if +} // VOID WarnSecureBootError() + +// Returns TRUE if this file is a valid EFI loader file, and is proper ARCH +static BOOLEAN IsValidLoader(EFI_FILE *RootDir, CHAR16 *FileName) { + BOOLEAN IsValid = TRUE; +#if defined (EFIX64) | defined (EFI32) + EFI_STATUS Status; + EFI_FILE_HANDLE FileHandle; + CHAR8 Header[512]; + UINTN Size = sizeof(Header); + + if ((RootDir == NULL) || (FileName == NULL)) { + // Assume valid here, because Macs produce NULL RootDir (& maybe FileName) + // when launching from a Firewire drive. This should be handled better, but + // fix would have to be in StartEFIImageList() and/or in FindVolumeAndFilename(). + return TRUE; + } // if + + Status = refit_call5_wrapper(RootDir->Open, RootDir, &FileHandle, FileName, EFI_FILE_MODE_READ, 0); + if (EFI_ERROR(Status)) + return FALSE; + + Status = refit_call3_wrapper(FileHandle->Read, FileHandle, &Size, Header); + refit_call1_wrapper(FileHandle->Close, FileHandle); + + IsValid = !EFI_ERROR(Status) && + Size == sizeof(Header) && + ((Header[0] == 'M' && Header[1] == 'Z' && + (Size = *(UINT32 *)&Header[0x3c]) < 0x180 && + Header[Size] == 'P' && Header[Size+1] == 'E' && + Header[Size+2] == 0 && Header[Size+3] == 0 && + *(UINT16 *)&Header[Size+4] == EFI_STUB_ARCH) || + (*(UINT32 *)&Header == FAT_ARCH)); +#endif + return IsValid; +} // BOOLEAN IsValidLoader() + // Launch an EFI binary. static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths, - IN CHAR16 *LoadOptions, IN CHAR16 *LoadOptionsPrefix, + IN CHAR16 *LoadOptions, IN UINTN LoaderType, IN CHAR16 *ImageTitle, IN CHAR8 OSType, OUT UINTN *ErrorInStep, - IN BOOLEAN Verbose) + IN BOOLEAN Verbose, + IN BOOLEAN IsDriver) { EFI_STATUS Status, ReturnStatus; EFI_HANDLE ChildImageHandle; EFI_LOADED_IMAGE *ChildLoadedImage = NULL; + REFIT_VOLUME *Volume = NULL; UINTN DevicePathIndex; CHAR16 ErrorInfo[256]; CHAR16 *FullLoadOptions = NULL; + CHAR16 *Filename = NULL; + CHAR16 *Temp; if (ErrorInStep != NULL) *ErrorInStep = 0; // set load options if (LoadOptions != NULL) { - if (LoadOptionsPrefix != NULL) { - MergeStrings(&FullLoadOptions, LoadOptions, L' '); - if (OSType == 'M') { - MergeStrings(&FullLoadOptions, L" ", 0); - // NOTE: That last space is also added by the EFI shell and seems to be significant - // when passing options to Apple's boot.efi... - } // if - } else { - MergeStrings(&FullLoadOptions, LoadOptions, 0); - } // if/else - } else { // LoadOptions == NULL - // NOTE: We provide a non-null string when no options are specified for safety; - // some systems (at least DUET) can hang when launching some programs (such as - // an EFI shell) without this. - FullLoadOptions = StrDuplicate(L" "); - } + FullLoadOptions = StrDuplicate(LoadOptions); + if ((LoaderType == TYPE_EFI) && (OSType == 'M')) { + MergeStrings(&FullLoadOptions, L" ", 0); + // NOTE: That last space is also added by the EFI shell and seems to be significant + // when passing options to Apple's boot.efi... + } // if + } // if (LoadOptions != NULL) if (Verbose) - Print(L"Starting %s\nUsing load options '%s'\n", ImageTitle, FullLoadOptions); + Print(L"Starting %s\nUsing load options '%s'\n", ImageTitle, FullLoadOptions ? FullLoadOptions : L""); // load the image into memory (and execute it, in the case of a shim/MOK image). ReturnStatus = Status = EFI_NOT_FOUND; // in case the list is empty for (DevicePathIndex = 0; DevicePaths[DevicePathIndex] != NULL; DevicePathIndex++) { - // NOTE: Below commented-out line could be more efficient if file were read ahead of - // time and passed as a pre-loaded image to LoadImage(), but it doesn't work on my - // 32-bit Mac Mini or my 64-bit Intel box when launching a Linux kernel; the - // kernel returns a "Failed to handle fs_proto" error message. - // TODO: Track down the cause of this error and fix it, if possible. - // ReturnStatus = Status = refit_call6_wrapper(BS->LoadImage, FALSE, SelfImageHandle, DevicePaths[DevicePathIndex], - // ImageData, ImageSize, &ChildImageHandle); - ReturnStatus = Status = refit_call6_wrapper(BS->LoadImage, FALSE, SelfImageHandle, DevicePaths[DevicePathIndex], - NULL, 0, &ChildImageHandle); + FindVolumeAndFilename(DevicePaths[DevicePathIndex], &Volume, &Filename); + // Some EFIs crash if attempting to load driver for invalid architecture, so + // protect for this condition; but sometimes Volume comes back NULL, so provide + // an exception. (TODO: Handle this special condition better.) + if ((LoaderType == TYPE_LEGACY) || (Volume == NULL) || IsValidLoader(Volume->RootDir, Filename)) { + if (Filename && (LoaderType != TYPE_LEGACY)) { + Temp = PoolPrint(L"\\%s %s", Filename, FullLoadOptions ? FullLoadOptions : L""); + if (Temp != NULL) { + MyFreePool(FullLoadOptions); + FullLoadOptions = Temp; + } + } // if (Filename) + + // NOTE: Below commented-out line could be more efficient if file were read ahead of + // time and passed as a pre-loaded image to LoadImage(), but it doesn't work on my + // 32-bit Mac Mini or my 64-bit Intel box when launching a Linux kernel; the + // kernel returns a "Failed to handle fs_proto" error message. + // TODO: Track down the cause of this error and fix it, if possible. + // ReturnStatus = Status = refit_call6_wrapper(BS->LoadImage, FALSE, SelfImageHandle, DevicePaths[DevicePathIndex], + // ImageData, ImageSize, &ChildImageHandle); + ReturnStatus = Status = refit_call6_wrapper(BS->LoadImage, FALSE, SelfImageHandle, DevicePaths[DevicePathIndex], + NULL, 0, &ChildImageHandle); + } else { + Print(L"Invalid loader file!\n"); + ReturnStatus = EFI_LOAD_ERROR; + } if (ReturnStatus != EFI_NOT_FOUND) { break; } } + if ((Status == EFI_ACCESS_DENIED) || (Status == EFI_SECURITY_VIOLATION)) { + WarnSecureBootError(ImageTitle, Verbose); + goto bailout; + } SPrint(ErrorInfo, 255, L"while loading %s", ImageTitle); if (CheckError(Status, ErrorInfo)) { if (ErrorInStep != NULL) @@ -239,7 +353,7 @@ static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths, goto bailout_unload; } ChildLoadedImage->LoadOptions = (VOID *)FullLoadOptions; - ChildLoadedImage->LoadOptionsSize = ((UINT32)StrLen(FullLoadOptions) + 1) * sizeof(CHAR16); + ChildLoadedImage->LoadOptionsSize = FullLoadOptions ? ((UINT32)StrLen(FullLoadOptions) + 1) * sizeof(CHAR16) : 0; // turn control over to the image // TODO: (optionally) re-enable the EFI watchdog timer! @@ -259,7 +373,8 @@ static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths, bailout_unload: // unload the image, we don't care if it works or not... - Status = refit_call1_wrapper(BS->UnloadImage, ChildImageHandle); + if (!IsDriver) + Status = refit_call1_wrapper(BS->UnloadImage, ChildImageHandle); bailout: MyFreePool(FullLoadOptions); @@ -267,29 +382,95 @@ bailout: } /* static EFI_STATUS StartEFIImageList() */ static EFI_STATUS StartEFIImage(IN EFI_DEVICE_PATH *DevicePath, - IN CHAR16 *LoadOptions, IN CHAR16 *LoadOptionsPrefix, + IN CHAR16 *LoadOptions, IN UINTN LoaderType, IN CHAR16 *ImageTitle, IN CHAR8 OSType, OUT UINTN *ErrorInStep, - IN BOOLEAN Verbose) + IN BOOLEAN Verbose, + IN BOOLEAN IsDriver + ) { EFI_DEVICE_PATH *DevicePaths[2]; DevicePaths[0] = DevicePath; DevicePaths[1] = NULL; - return StartEFIImageList(DevicePaths, LoadOptions, LoadOptionsPrefix, ImageTitle, OSType, ErrorInStep, Verbose); + return StartEFIImageList(DevicePaths, LoadOptions, LoaderType, ImageTitle, OSType, ErrorInStep, Verbose, IsDriver); } /* static EFI_STATUS StartEFIImage() */ +// From gummiboot: Reboot the computer into its built-in user interface +static EFI_STATUS RebootIntoFirmware(VOID) { + CHAR8 *b; + UINTN size; + UINT64 osind; + EFI_STATUS err; + + osind = EFI_OS_INDICATIONS_BOOT_TO_FW_UI; + + err = EfivarGetRaw(&GlobalGuid, L"OsIndications", &b, &size); + if (err == EFI_SUCCESS) + osind |= (UINT64)*b; + MyFreePool(b); + + err = EfivarSetRaw(&GlobalGuid, L"OsIndications", (CHAR8 *)&osind, sizeof(UINT64), TRUE); + if (err != EFI_SUCCESS) + return err; + + refit_call4_wrapper(RT->ResetSystem, EfiResetCold, EFI_SUCCESS, 0, NULL); + Print(L"Error calling ResetSystem: %r", err); + PauseForKey(); + return err; +} + +// Record the value of the loader's name/description in rEFInd's "PreviousBoot" EFI variable, +// if it's different from what's already stored there. +static VOID StoreLoaderName(IN CHAR16 *Name) { + EFI_STATUS Status; + CHAR16 *OldName = NULL; + UINTN Length; + + if (Name) { + Status = EfivarGetRaw(&RefindGuid, L"PreviousBoot", (CHAR8**) &OldName, &Length); + if ((Status != EFI_SUCCESS) || (StrCmp(OldName, Name) != 0)) { + EfivarSetRaw(&RefindGuid, L"PreviousBoot", (CHAR8*) Name, StrLen(Name) * 2 + 2, TRUE); + } // if + MyFreePool(OldName); + } // if +} // VOID StoreLoaderName() + // // EFI OS loader functions // -static VOID StartLoader(IN LOADER_ENTRY *Entry) +// See http://www.thomas-krenn.com/en/wiki/Activating_the_Intel_VT_Virtualization_Feature +// for information on Intel VMX features +static VOID DoEnableAndLockVMX(VOID) +{ + UINT32 msr = 0x3a; + UINT32 low_bits = 0, high_bits = 0; + + // is VMX active ? + __asm__ volatile ("rdmsr" : "=a" (low_bits), "=d" (high_bits) : "c" (msr)); + + // enable and lock vmx if not locked + if ((low_bits & 1) == 0) { + high_bits = 0; + low_bits = 0x05; + msr = 0x3a; + __asm__ volatile ("wrmsr" : : "c" (msr), "a" (low_bits), "d" (high_bits)); + } +} // VOID DoEnableAndLockVMX() + +static VOID StartLoader(LOADER_ENTRY *Entry, CHAR16 *SelectionName) { UINTN ErrorInStep = 0; + if (GlobalConfig.EnableAndLockVMX) { + DoEnableAndLockVMX(); + } + BeginExternalScreen(Entry->UseGraphicsMode, L"Booting OS"); - StartEFIImage(Entry->DevicePath, Entry->LoadOptions, Basename(Entry->LoaderPath), - Basename(Entry->LoaderPath), Entry->OSType, &ErrorInStep, !Entry->UseGraphicsMode); + StoreLoaderName(SelectionName); + StartEFIImage(Entry->DevicePath, Entry->LoadOptions, TYPE_EFI, + Basename(Entry->LoaderPath), Entry->OSType, &ErrorInStep, !Entry->UseGraphicsMode, FALSE); FinishExternalScreen(); } @@ -301,7 +482,7 @@ static VOID StartLoader(IN LOADER_ENTRY *Entry) // '\EFI\kernels\initramfs-3.3.0.img'. If the directory ALSO contains the file // initramfs-3.3.0-rc7.img or initramfs-13.3.0.img, those files will NOT match; // however, initmine-3.3.0.img might match. (FindInitrd() returns the first match it -// finds). Thus, care should be taken to avoid placing duplicate matching files in +// finds.) Thus, care should be taken to avoid placing duplicate matching files in // the kernel's directory. // If no matching init file can be found, returns NULL. static CHAR16 * FindInitrd(IN CHAR16 *LoaderPath, IN REFIT_VOLUME *Volume) { @@ -328,13 +509,11 @@ static CHAR16 * FindInitrd(IN CHAR16 *LoaderPath, IN REFIT_VOLUME *Volume) { InitrdVersion = FindNumbers(DirEntry->FileName); if (KernelVersion != NULL) { if (StriCmp(InitrdVersion, KernelVersion) == 0) { - MergeStrings(&InitrdName, Path, 0); - MergeStrings(&InitrdName, DirEntry->FileName, 0); + InitrdName = PoolPrint(L"%s%s", Path, DirEntry->FileName); } // if } else { if (InitrdVersion == NULL) { - MergeStrings(&InitrdName, Path, 0); - MergeStrings(&InitrdName, DirEntry->FileName, 0); + InitrdName = PoolPrint(L"%s%s", Path, DirEntry->FileName); } // if } // if/else MyFreePool(InitrdVersion); @@ -604,12 +783,12 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { // earlier.... if ((SubScreen->Entries != NULL) && (SubScreen->Entries[0] != NULL)) { MyFreePool(SubScreen->Entries[0]->Title); - SubScreen->Entries[0]->Title = StrDuplicate(TokenList[0]); + SubScreen->Entries[0]->Title = TokenList[0] ? StrDuplicate(TokenList[0]) : StrDuplicate(L"Boot Linux"); } // if FreeTokenLine(&TokenList, &TokenCount); while ((TokenCount = ReadTokenLine(File, &TokenList)) > 1) { SubEntry = InitializeLoaderEntry(Entry); - SubEntry->me.Title = StrDuplicate(TokenList[0]); + SubEntry->me.Title = TokenList[0] ? StrDuplicate(TokenList[0]) : StrDuplicate(L"Boot Linux"); MyFreePool(SubEntry->LoadOptions); SubEntry->LoadOptions = AddInitrdToOptions(TokenList[1], InitrdName); FreeTokenLine(&TokenList, &TokenCount); @@ -618,7 +797,7 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { } // while MyFreePool(InitrdName); MyFreePool(File); - } // if Linux options file exists + } // if } else if (Entry->OSType == 'E') { // entries for ELILO SubEntry = InitializeLoaderEntry(Entry); @@ -707,106 +886,146 @@ static CHAR16 * GetMainLinuxOptions(IN CHAR16 * LoaderPath, IN REFIT_VOLUME *Vol return (FullOptions); } // static CHAR16 * GetMainLinuxOptions() +// Try to guess the name of the Linux distribution & add that name to +// OSIconName list. +static VOID GuessLinuxDistribution(CHAR16 **OSIconName, REFIT_VOLUME *Volume, CHAR16 *LoaderPath) { + UINTN FileSize = 0; + REFIT_FILE File; + CHAR16** TokenList; + UINTN TokenCount = 0; + + // If on Linux root fs, /etc/os-release file probably has clues.... + if (FileExists(Volume->RootDir, L"etc\\os-release") && + (ReadFile(Volume->RootDir, L"etc\\os-release", &File, &FileSize) == EFI_SUCCESS)) { + do { + TokenCount = ReadTokenLine(&File, &TokenList); + if ((TokenCount > 1) && ((StriCmp(TokenList[0], L"ID") == 0) || (StriCmp(TokenList[0], L"NAME") == 0))) { + MergeStrings(OSIconName, TokenList[1], L','); + } // if + FreeTokenLine(&TokenList, &TokenCount); + } while (TokenCount > 0); + MyFreePool(File.Buffer); + } // if + + // Search for clues in the kernel's filename.... + if (StriSubCmp(L".fc", LoaderPath)) + MergeStrings(OSIconName, L"fedora", L','); + if (StriSubCmp(L".el", LoaderPath)) + MergeStrings(OSIconName, L"redhat", L','); +} // VOID GuessLinuxDistribution() + // Sets a few defaults for a loader entry -- mainly the icon, but also the OS type // code and shortcut letter. For Linux EFI stub loaders, also sets kernel options // that will (with luck) work fairly automatically. VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, REFIT_VOLUME *Volume) { - CHAR16 *FileName, *PathOnly, *IconNames = NULL, *NoExtension, *OSIconName = NULL, *Temp, *SubString; + CHAR16 *NameClues, *PathOnly, *NoExtension, *OSIconName = NULL, *Temp, *SubString; CHAR16 ShortcutLetter = 0; UINTN i = 0, Length; - FileName = Basename(LoaderPath); + NameClues = Basename(LoaderPath); PathOnly = FindPath(LoaderPath); - NoExtension = StripEfiExtension(FileName); + NoExtension = StripEfiExtension(NameClues); + + if (Volume->DiskKind == DISK_KIND_NET) { + MergeStrings(&NameClues, Entry->me.Title, L' '); + } else { + // 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 = egLoadIconAnyType(Volume->RootDir, PathOnly, NoExtension, GlobalConfig.IconSizes[ICON_SIZE_BIG]); + } + if (!Entry->me.Image) { + Entry->me.Image = egCopyImage(Volume->VolIconImage); + } - // locate a custom icon for the loader - // Anything found here takes precedence over the "hints" in the OSIconName variable - while ((Temp = FindCommaDelimited(ICON_EXTENSIONS, i++)) != NULL) { - MergeStrings(&IconNames, NoExtension, L','); - MergeStrings(&IconNames, Temp, L'.'); + // Begin creating icon "hints" by using last part of directory path leading + // to the loader + Temp = FindLastDirName(LoaderPath); + MergeStrings(&OSIconName, Temp, L','); MyFreePool(Temp); - } - Entry->me.Image = LoadIcns(Volume->RootDir, IconNames, 128); - if (!Entry->me.Image) - Entry->me.Image = Volume->VolIconImage; - MyFreePool(IconNames); - - // Begin creating icon "hints" by using last part of directory path leading - // to the loader - Temp = FindLastDirName(LoaderPath); - MergeStrings(&OSIconName, Temp, L','); - MyFreePool(Temp); - Temp = NULL; - if (OSIconName != NULL) { - ShortcutLetter = OSIconName[0]; - } + Temp = NULL; + if (OSIconName != NULL) { + ShortcutLetter = OSIconName[0]; + } - // Add every "word" in the volume label, delimited by spaces, dashes (-), or - // underscores (_), to the list of hints to be used in searching for OS - // icons. - if ((Volume->VolName) && (StrLen(Volume->VolName) > 0)) { - Temp = SubString = StrDuplicate(Volume->VolName); - if (Temp != NULL) { - Length = StrLen(Temp); - for (i = 0; i < Length; i++) { - if ((Temp[i] == L' ') || (Temp[i] == L'_') || (Temp[i] == L'-')) { - Temp[i] = 0; - if (StrLen(SubString) > 0) - MergeStrings(&OSIconName, SubString, L','); - SubString = Temp + i + 1; - } // if - } // for - MergeStrings(&OSIconName, SubString, L','); - MyFreePool(Temp); + // Add every "word" in the volume label, delimited by spaces, dashes (-), or + // underscores (_), to the list of hints to be used in searching for OS + // icons. + if ((Volume->VolName) && (StrLen(Volume->VolName) > 0)) { + Temp = SubString = StrDuplicate(Volume->VolName); + if (Temp != NULL) { + Length = StrLen(Temp); + for (i = 0; i < Length; i++) { + if ((Temp[i] == L' ') || (Temp[i] == L'_') || (Temp[i] == L'-')) { + Temp[i] = 0; + if (StrLen(SubString) > 0) + MergeStrings(&OSIconName, SubString, L','); + SubString = Temp + i + 1; + } // if + } // for + MergeStrings(&OSIconName, SubString, L','); + MyFreePool(Temp); + } // if } // if - } // if + } // if/else network boot // detect specific loaders - if (StriSubCmp(L"bzImage", LoaderPath) || StriSubCmp(L"vmlinuz", LoaderPath)) { + if (StriSubCmp(L"bzImage", NameClues) || StriSubCmp(L"vmlinuz", NameClues)) { + if (Volume->DiskKind != DISK_KIND_NET) { + GuessLinuxDistribution(&OSIconName, Volume, LoaderPath); + Entry->LoadOptions = GetMainLinuxOptions(LoaderPath, Volume); + } MergeStrings(&OSIconName, L"linux", L','); Entry->OSType = 'L'; if (ShortcutLetter == 0) ShortcutLetter = 'L'; - Entry->LoadOptions = GetMainLinuxOptions(LoaderPath, Volume); Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_LINUX; } else if (StriSubCmp(L"refit", LoaderPath)) { MergeStrings(&OSIconName, L"refit", L','); Entry->OSType = 'R'; ShortcutLetter = 'R'; + } else if (StriSubCmp(L"refind", LoaderPath)) { + MergeStrings(&OSIconName, L"refind", L','); + Entry->OSType = 'R'; + ShortcutLetter = 'R'; } else if (StriCmp(LoaderPath, MACOSX_LOADER_PATH) == 0) { - if (Volume->VolIconImage != NULL) { // custom icon file found - Entry->me.Image = Volume->VolIconImage; - } MergeStrings(&OSIconName, L"mac", L','); Entry->OSType = 'M'; ShortcutLetter = 'M'; Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_OSX; - } else if (StriCmp(FileName, L"diags.efi") == 0) { + } else if (StriCmp(NameClues, L"diags.efi") == 0) { MergeStrings(&OSIconName, L"hwtest", L','); - } else if (StriCmp(FileName, L"e.efi") == 0 || StriCmp(FileName, L"elilo.efi") == 0 || StriSubCmp(L"elilo", FileName)) { + } else if (StriCmp(NameClues, L"e.efi") == 0 || StriCmp(NameClues, L"elilo.efi") == 0 || StriSubCmp(L"elilo", NameClues)) { MergeStrings(&OSIconName, L"elilo,linux", L','); Entry->OSType = 'E'; if (ShortcutLetter == 0) ShortcutLetter = 'L'; Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_ELILO; - } else if (StriSubCmp(L"grub", FileName)) { + } else if (StriSubCmp(L"grub", NameClues)) { + MergeStrings(&OSIconName, L"grub,linux", L','); Entry->OSType = 'G'; ShortcutLetter = 'G'; Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_GRUB; - } else if (StriCmp(FileName, L"cdboot.efi") == 0 || - StriCmp(FileName, L"bootmgr.efi") == 0 || - StriCmp(FileName, L"bootmgfw.efi") == 0) { + } else if (StriCmp(NameClues, L"cdboot.efi") == 0 || + StriCmp(NameClues, L"bootmgr.efi") == 0 || + StriCmp(NameClues, L"bootmgfw.efi") == 0 || + StriCmp(NameClues, L"bkpbootmgfw.efi") == 0) { MergeStrings(&OSIconName, L"win", L','); Entry->OSType = 'W'; ShortcutLetter = 'W'; Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS; - } else if (StriCmp(FileName, L"xom.efi") == 0) { + } else if (StriCmp(NameClues, L"xom.efi") == 0) { MergeStrings(&OSIconName, L"xom,win", L','); Entry->UseGraphicsMode = TRUE; Entry->OSType = 'X'; ShortcutLetter = 'W'; Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS; } + else if (StriSubCmp(L"ipxe", NameClues)) { + Entry->OSType = 'N'; + ShortcutLetter = 'N'; + MergeStrings(&OSIconName, L"network", L','); + } if ((ShortcutLetter >= 'a') && (ShortcutLetter <= 'z')) ShortcutLetter = ShortcutLetter - 'a' + 'A'; // convert lowercase to uppercase @@ -816,6 +1035,38 @@ VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, REFIT_VOLUME *Vo MyFreePool(PathOnly); } // VOID SetLoaderDefaults() +// // Add a network (PXE) EFI boot loader to the list, using automatic settings +// // for icons, options, etc. +// LOADER_ENTRY * AddNetbootLoaderEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Volume) { +// LOADER_ENTRY *Entry; +// +// Print(L"Adding iPXE entry for '%s'\n", LoaderTitle); +// PauseForKey(); +// CleanUpPathNameSlashes(LoaderPath); +// Entry = InitializeLoaderEntry(NULL); +// if (Entry != NULL) { +// Entry->Title = StrDuplicate((LoaderTitle != NULL) ? LoaderTitle : LoaderPath); +// Entry->me.Title = AllocateZeroPool(sizeof(CHAR16) * 256); +// // Extra space at end of Entry->me.Title enables searching on Volume->VolName even if another volume +// // name is identical except for something added to the end (e.g., VolB1 vs. VolB12). +// SPrint(Entry->me.Title, 255, L"NetBoot %s", (LoaderTitle != NULL) ? LoaderTitle : LoaderPath); +// Entry->me.Row = 0; +// if ((LoaderPath != NULL) && (LoaderPath[0] != L'\\')) { +// Entry->LoaderPath = StrDuplicate(L"\\"); +// } else { +// Entry->LoaderPath = NULL; +// } +// MergeStrings(&(Entry->LoaderPath), LoaderPath, 0); +// Entry->VolName = Volume->VolName; +// Entry->DevicePath = FileDevicePath(Volume->DeviceHandle, Entry->LoaderPath); +// SetLoaderDefaults(Entry, LoaderPath, Volume); +// GenerateSubScreen(Entry, Volume); +// AddMenuEntry(&MainMenu, (REFIT_MENU_ENTRY *)Entry); +// } +// +// return(Entry); +// } // LOADER_ENTRY * AddLoaderEntry() + // Add a specified EFI boot loader to the list, using automatic settings // for icons, options, etc. LOADER_ENTRY * AddLoaderEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Volume) { @@ -826,7 +1077,13 @@ LOADER_ENTRY * AddLoaderEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN if (Entry != NULL) { Entry->Title = StrDuplicate((LoaderTitle != NULL) ? LoaderTitle : LoaderPath); Entry->me.Title = AllocateZeroPool(sizeof(CHAR16) * 256); - SPrint(Entry->me.Title, 255, L"Boot %s from %s", (LoaderTitle != NULL) ? LoaderTitle : LoaderPath, Volume->VolName); + // Extra space at end of Entry->me.Title enables searching on Volume->VolName even if another volume + // name is identical except for something added to the end (e.g., VolB1 vs. VolB12). + // Note: Volume->VolName will be NULL for network boot programs. + if (Volume->VolName) + SPrint(Entry->me.Title, 255, L"Boot %s from %s ", (LoaderTitle != NULL) ? LoaderTitle : LoaderPath, Volume->VolName); + else + SPrint(Entry->me.Title, 255, L"Boot %s ", (LoaderTitle != NULL) ? LoaderTitle : LoaderPath); Entry->me.Row = 0; Entry->me.BadgeImage = Volume->VolBadgeImage; if ((LoaderPath != NULL) && (LoaderPath[0] != L'\\')) { @@ -903,52 +1160,187 @@ static VOID CleanUpLoaderList(struct LOADER_LIST *LoaderList) { // Returns FALSE if the specified file/volume matches the GlobalConfig.DontScanDirs // or GlobalConfig.DontScanVolumes specification, or if Path points to a volume -// other than the one specified by Volume. Returns TRUE if none of these conditions -// is met -- that is, if the path is eligible for scanning. Also reduces *Path to a -// path alone, with no volume specification. +// other than the one specified by Volume, or if the specified path is SelfDir. +// Returns TRUE if none of these conditions is met -- that is, if the path is +// eligible for scanning. static BOOLEAN ShouldScan(REFIT_VOLUME *Volume, CHAR16 *Path) { - CHAR16 *VolName = NULL, *DontScanDir; - UINTN i = 0, VolNum; + CHAR16 *VolName = NULL, *DontScanDir, *PathCopy = NULL; + UINTN i = 0; BOOLEAN ScanIt = TRUE; - if (IsIn(Volume->VolName, GlobalConfig.DontScanVolumes)) + if ((IsIn(Volume->VolName, GlobalConfig.DontScanVolumes)) || (IsIn(Volume->PartName, GlobalConfig.DontScanVolumes))) + return FALSE; + + if ((StriCmp(Path, SelfDirPath) == 0) && (Volume->DeviceHandle == SelfVolume->DeviceHandle)) return FALSE; - while ((DontScanDir = FindCommaDelimited(GlobalConfig.DontScanDirs, i++)) && ScanIt) { + // See if Path includes an explicit volume declaration that's NOT Volume.... + PathCopy = StrDuplicate(Path); + if (SplitVolumeAndFilename(&PathCopy, &VolName)) { + VolumeNumberToName(Volume, &VolName); + if (VolName && StriCmp(VolName, Volume->VolName) != 0) { + ScanIt = FALSE; + } // if + } // if Path includes volume specification + MyFreePool(PathCopy); + MyFreePool(VolName); + VolName = NULL; + + // See if Volume is in GlobalConfig.DontScanDirs.... + while (ScanIt && (DontScanDir = FindCommaDelimited(GlobalConfig.DontScanDirs, i++))) { SplitVolumeAndFilename(&DontScanDir, &VolName); CleanUpPathNameSlashes(DontScanDir); + VolumeNumberToName(Volume, &VolName); if (VolName != NULL) { if ((StriCmp(VolName, Volume->VolName) == 0) && (StriCmp(DontScanDir, Path) == 0)) ScanIt = FALSE; - if ((StrLen(VolName) > 2) && (VolName[0] == L'f') && (VolName[1] == L's') && (VolName[2] >= L'0') && (VolName[2] <= L'9')) { - VolNum = Atoi(VolName + 2); - if ((VolNum == Volume->VolNumber) && (StriCmp(DontScanDir, Path) == 0)) - ScanIt = FALSE; - } } else { if (StriCmp(DontScanDir, Path) == 0) ScanIt = FALSE; } MyFreePool(DontScanDir); + MyFreePool(VolName); DontScanDir = NULL; - } + VolName = NULL; + } // while() + return ScanIt; } // BOOLEAN ShouldScan() +// Returns TRUE if the file is byte-for-byte identical with the fallback file +// on the volume AND if the file is not itself the fallback file; returns +// FALSE if the file is not identical to the fallback file OR if the file +// IS the fallback file. Intended for use in excluding the fallback boot +// loader when it's a duplicate of another boot loader. +static BOOLEAN DuplicatesFallback(IN REFIT_VOLUME *Volume, IN CHAR16 *FileName) { + CHAR8 *FileContents, *FallbackContents; + EFI_FILE_HANDLE FileHandle, FallbackHandle; + EFI_FILE_INFO *FileInfo, *FallbackInfo; + UINTN FileSize = 0, FallbackSize = 0; + EFI_STATUS Status; + BOOLEAN AreIdentical = FALSE; + + if (!FileExists(Volume->RootDir, FileName) || !FileExists(Volume->RootDir, FALLBACK_FULLNAME)) + return FALSE; + + CleanUpPathNameSlashes(FileName); + + if (StriCmp(FileName, FALLBACK_FULLNAME) == 0) + return FALSE; // identical filenames, so not a duplicate.... + + Status = refit_call5_wrapper(Volume->RootDir->Open, Volume->RootDir, &FileHandle, FileName, EFI_FILE_MODE_READ, 0); + if (Status == EFI_SUCCESS) { + FileInfo = LibFileInfo(FileHandle); + FileSize = FileInfo->FileSize; + } else { + return FALSE; + } + + Status = refit_call5_wrapper(Volume->RootDir->Open, Volume->RootDir, &FallbackHandle, FALLBACK_FULLNAME, EFI_FILE_MODE_READ, 0); + if (Status == EFI_SUCCESS) { + FallbackInfo = LibFileInfo(FallbackHandle); + FallbackSize = FallbackInfo->FileSize; + } else { + refit_call1_wrapper(FileHandle->Close, FileHandle); + return FALSE; + } + + if (FallbackSize != FileSize) { // not same size, so can't be identical + AreIdentical = FALSE; + } else { // could be identical; do full check.... + FileContents = AllocatePool(FileSize); + FallbackContents = AllocatePool(FallbackSize); + if (FileContents && FallbackContents) { + Status = refit_call3_wrapper(FileHandle->Read, FileHandle, &FileSize, FileContents); + if (Status == EFI_SUCCESS) { + Status = refit_call3_wrapper(FallbackHandle->Read, FallbackHandle, &FallbackSize, FallbackContents); + } + if (Status == EFI_SUCCESS) { + AreIdentical = (CompareMem(FileContents, FallbackContents, FileSize) == 0); + } // if + } // if + MyFreePool(FileContents); + MyFreePool(FallbackContents); + } // if/else + + // BUG ALERT: Some systems (e.g., DUET, some Macs with large displays) crash if the + // following two calls are reversed. Go figure.... + refit_call1_wrapper(FileHandle->Close, FallbackHandle); + refit_call1_wrapper(FileHandle->Close, FileHandle); + return AreIdentical; +} // BOOLEAN DuplicatesFallback() + +// Returns FALSE if two measures of file size are identical for a single file, +// TRUE if not or if the file can't be opened and the other measure is non-0. +// Despite the function's name, this isn't really a direct test of symbolic +// link status, since EFI doesn't officially support symlinks. It does seem +// to be a reliable indicator, though. (OTOH, some disk errors might cause a +// file to fail to open, which would return a false positive -- but as I use +// this function to exclude symbolic links from the list of boot loaders, +// that would be fine, since such boot loaders wouldn't work.) +static BOOLEAN IsSymbolicLink(REFIT_VOLUME *Volume, CHAR16 *Path, EFI_FILE_INFO *DirEntry) { + EFI_FILE_HANDLE FileHandle; + EFI_FILE_INFO *FileInfo = NULL; + EFI_STATUS Status; + UINTN FileSize2 = 0; + CHAR16 *FileName; + + FileName = StrDuplicate(Path); + MergeStrings(&FileName, DirEntry->FileName, L'\\'); + CleanUpPathNameSlashes(FileName); + + Status = refit_call5_wrapper(Volume->RootDir->Open, Volume->RootDir, &FileHandle, FileName, EFI_FILE_MODE_READ, 0); + if (Status == EFI_SUCCESS) { + FileInfo = LibFileInfo(FileHandle); + if (FileInfo != NULL) + FileSize2 = FileInfo->FileSize; + } + + MyFreePool(FileName); + MyFreePool(FileInfo); + + return (DirEntry->FileSize != FileSize2); +} // BOOLEAN IsSymbolicLink() + +// Returns TRUE if a file with the same name as the original but with +// ".efi.signed" is also present in the same directory. Ubuntu is using +// this filename as a signed version of the original unsigned kernel, and +// there's no point in cluttering the display with two kernels that will +// behave identically on non-SB systems, or when one will fail when SB +// is active. +static BOOLEAN HasSignedCounterpart(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 *Filename) { + CHAR16 *NewFile = NULL; + BOOLEAN retval = FALSE; + + MergeStrings(&NewFile, Path, 0); + MergeStrings(&NewFile, Filename, L'\\'); + MergeStrings(&NewFile, L".efi.signed", 0); + if (NewFile != NULL) { + CleanUpPathNameSlashes(NewFile); + if (FileExists(Volume->RootDir, NewFile)) + retval = TRUE; + MyFreePool(NewFile); + } // if + + return retval; +} // BOOLEAN HasSignedCounterpart() + // Scan an individual directory for EFI boot loader files and, if found, -// add them to the list. Sorts the entries within the loader directory -// so that the most recent one appears first in the list. -static VOID ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 *Pattern) +// add them to the list. Exception: Ignores FALLBACK_FULLNAME, which is picked +// up in ScanEfiFiles(). Sorts the entries within the loader directory so that +// the most recent one appears first in the list. +// Returns TRUE if a duplicate for FALLBACK_FILENAME was found, FALSE if not. +static BOOLEAN ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 *Pattern) { EFI_STATUS Status; REFIT_DIR_ITER DirIter; EFI_FILE_INFO *DirEntry; CHAR16 FileName[256], *Extension; struct LOADER_LIST *LoaderList = NULL, *NewLoader; + BOOLEAN FoundFallbackDuplicate = FALSE; if ((!SelfDirPath || !Path || ((StriCmp(Path, SelfDirPath) == 0) && (Volume->DeviceHandle != SelfVolume->DeviceHandle)) || - (StriCmp(Path, SelfDirPath) != 0)) && - (ShouldScan(Volume, Path))) { + (StriCmp(Path, SelfDirPath) != 0)) && (ShouldScan(Volume, Path))) { // look through contents of the directory DirIterOpen(Volume->RootDir, Path, &DirIter); while (DirIterNext(&DirIter, 2, Pattern, &DirEntry)) { @@ -956,8 +1348,11 @@ static VOID ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 *P if (DirEntry->FileName[0] == '.' || StriCmp(Extension, L".icns") == 0 || StriCmp(Extension, L".png") == 0 || + (StriCmp(DirEntry->FileName, FALLBACK_BASENAME) == 0 && (StriCmp(Path, L"EFI\\BOOT") == 0)) || StriSubCmp(L"shell", DirEntry->FileName) || - IsIn(DirEntry->FileName, GlobalConfig.DontScanFiles)) + IsSymbolicLink(Volume, Path, DirEntry) || /* is symbolic link */ + HasSignedCounterpart(Volume, Path, DirEntry->FileName) || /* a file with same name plus ".efi.signed" is present */ + FilenameIn(Volume, Path, DirEntry->FileName, GlobalConfig.DontScanFiles)) continue; // skip this if (Path) @@ -965,74 +1360,159 @@ static VOID ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 *P else SPrint(FileName, 255, L"\\%s", DirEntry->FileName); CleanUpPathNameSlashes(FileName); + + if(!IsValidLoader(Volume->RootDir, FileName)) + continue; + NewLoader = AllocateZeroPool(sizeof(struct LOADER_LIST)); if (NewLoader != NULL) { NewLoader->FileName = StrDuplicate(FileName); NewLoader->TimeStamp = DirEntry->ModificationTime; LoaderList = AddLoaderListEntry(LoaderList, NewLoader); + if (DuplicatesFallback(Volume, FileName)) + FoundFallbackDuplicate = TRUE; } // if MyFreePool(Extension); } // while + NewLoader = LoaderList; while (NewLoader != NULL) { AddLoaderEntry(NewLoader->FileName, NULL, Volume); NewLoader = NewLoader->NextEntry; } // while + CleanUpLoaderList(LoaderList); Status = DirIterClose(&DirIter); - if (Status != EFI_NOT_FOUND) { + // NOTE: EFI_INVALID_PARAMETER really is an error that should be reported; + // but I've gotten reports from users who are getting this error occasionally + // and I can't find anything wrong or reproduce the problem, so I'm putting + // it down to buggy EFI implementations and ignoring that particular error.... + if ((Status != EFI_NOT_FOUND) && (Status != EFI_INVALID_PARAMETER)) { if (Path) SPrint(FileName, 255, L"while scanning the %s directory", Path); else StrCpy(FileName, L"while scanning the root directory"); CheckError(Status, FileName); } // if (Status != EFI_NOT_FOUND) - } // if not scanning our own directory + } // if not scanning a blacklisted directory + + return FoundFallbackDuplicate; } /* static VOID ScanLoaderDir() */ +// Run the IPXE_DISCOVER_NAME program, which obtains the IP address of the boot +// server and the name of the boot file it delivers. +CHAR16* RuniPXEDiscover(EFI_HANDLE Volume) +{ + EFI_STATUS Status; + EFI_DEVICE_PATH *FilePath; + EFI_HANDLE iPXEHandle; + CHAR16 *boot_info; + UINTN boot_info_size = 256 * sizeof(CHAR16); + + FilePath = FileDevicePath (Volume, IPXE_DISCOVER_NAME); + Status = refit_call6_wrapper(BS->LoadImage, FALSE, SelfImageHandle, FilePath, + NULL, 0, &iPXEHandle); + if (Status != 0) { + return NULL; + } // if + + boot_info = AllocatePool(256 * sizeof(CHAR16)); + Status = refit_call3_wrapper(BS->StartImage, iPXEHandle, &boot_info_size, &boot_info); + + return boot_info; +} // RuniPXEDiscover() + +// Scan for network (PXE) boot servers. This function relies on the presence +// of the IPXE_DISCOVER_NAME and IPXE_NAME program files on the volume from +// which rEFInd launched. As of December 6, 2014, these tools aren't entirely +// reliable. See BUILDING.txt for information on building them. +static VOID ScanNetboot() { + CHAR16 *iPXEFileName = IPXE_NAME; + CHAR16 *Location; + REFIT_VOLUME *NetVolume; + + if (FileExists(SelfVolume->RootDir, IPXE_DISCOVER_NAME) && + FileExists(SelfVolume->RootDir, IPXE_NAME) && + IsValidLoader(SelfVolume->RootDir, IPXE_DISCOVER_NAME) && + IsValidLoader(SelfVolume->RootDir, IPXE_NAME)) { + Location = RuniPXEDiscover(SelfVolume->DeviceHandle); + if (Location != NULL && FileExists(SelfVolume->RootDir, iPXEFileName)) { + NetVolume = AllocatePool(sizeof(REFIT_VOLUME)); + CopyMem(NetVolume, SelfVolume, sizeof(REFIT_VOLUME)); + NetVolume->DiskKind = DISK_KIND_NET; + NetVolume->VolBadgeImage = BuiltinIcon(BUILTIN_ICON_VOL_NET); + NetVolume->PartName = NetVolume->VolName = NULL; + AddLoaderEntry(iPXEFileName, Location, NetVolume); + MyFreePool(NetVolume); + } // if support files exist and are valid + } +} // VOID ScanNetBoot() + static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { EFI_STATUS Status; REFIT_DIR_ITER EfiDirIter; EFI_FILE_INFO *EfiDirEntry; - CHAR16 FileName[256], *Directory, *MatchPatterns, *VolName = NULL; - UINTN i, Length, VolNum; + CHAR16 FileName[256], *Directory = NULL, *MatchPatterns, *VolName = NULL, *SelfPath; + UINTN i, Length; + BOOLEAN ScanFallbackLoader = TRUE; + BOOLEAN FoundBRBackup = FALSE; - MatchPatterns = StrDuplicate(LOADER_MATCH_PATTERNS); - if (GlobalConfig.ScanAllLinux) - MergeStrings(&MatchPatterns, LINUX_MATCH_PATTERNS, L','); + if ((Volume->RootDir != NULL) && (Volume->VolName != NULL) && (Volume->IsReadable)) { + MatchPatterns = StrDuplicate(LOADER_MATCH_PATTERNS); + if (GlobalConfig.ScanAllLinux) + MergeStrings(&MatchPatterns, LINUX_MATCH_PATTERNS, L','); - if ((Volume->RootDir != NULL) && (Volume->VolName != NULL)) { // check for Mac OS X boot loader - if (!IsIn(L"System\\Library\\CoreServices", GlobalConfig.DontScanDirs)) { + if (ShouldScan(Volume, L"System\\Library\\CoreServices")) { StrCpy(FileName, MACOSX_LOADER_PATH); - if (FileExists(Volume->RootDir, FileName) && !IsIn(L"boot.efi", GlobalConfig.DontScanFiles)) { + if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, Directory, L"boot.efi", GlobalConfig.DontScanFiles)) { AddLoaderEntry(FileName, L"Mac OS X", Volume); + if (DuplicatesFallback(Volume, FileName)) + ScanFallbackLoader = FALSE; } // check for XOM StrCpy(FileName, L"System\\Library\\CoreServices\\xom.efi"); - if (FileExists(Volume->RootDir, FileName) && !IsIn(L"boot.efi", GlobalConfig.DontScanFiles)) { + if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, Directory, L"boot.efi", GlobalConfig.DontScanFiles)) { AddLoaderEntry(FileName, L"Windows XP (XoM)", Volume); + if (DuplicatesFallback(Volume, FileName)) + ScanFallbackLoader = FALSE; } - } // if Mac directory not in GlobalConfig.DontScanDirs list + } // if should scan Mac directory // check for Microsoft boot loader/menu - StrCpy(FileName, L"EFI\\Microsoft\\Boot\\Bootmgfw.efi"); - if (FileExists(Volume->RootDir, FileName) && !IsIn(L"EFI\\Microsoft\\Boot", GlobalConfig.DontScanDirs) && - !IsIn(L"bootmgfw.efi", GlobalConfig.DontScanFiles)) { - AddLoaderEntry(FileName, L"Microsoft EFI boot", Volume); - } + if (ShouldScan(Volume, L"EFI\\Microsoft\\Boot")) { + StrCpy(FileName, L"EFI\\Microsoft\\Boot\\bkpbootmgfw.efi"); + if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, Directory, L"bkpbootmgfw.efi", + GlobalConfig.DontScanFiles)) { + AddLoaderEntry(FileName, L"Microsoft EFI boot (Boot Repair backup)", Volume); + FoundBRBackup = TRUE; + if (DuplicatesFallback(Volume, FileName)) + ScanFallbackLoader = FALSE; + } + StrCpy(FileName, L"EFI\\Microsoft\\Boot\\bootmgfw.efi"); + if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, Directory, L"bootmgfw.efi", GlobalConfig.DontScanFiles)) { + if (FoundBRBackup) + AddLoaderEntry(FileName, L"Supposed Microsoft EFI boot (probably GRUB)", Volume); + else + AddLoaderEntry(FileName, L"Microsoft EFI boot", Volume); + if (DuplicatesFallback(Volume, FileName)) + ScanFallbackLoader = FALSE; + } + } // if // scan the root directory for EFI executables - ScanLoaderDir(Volume, L"\\", MatchPatterns); + if (ScanLoaderDir(Volume, L"\\", MatchPatterns)) + ScanFallbackLoader = FALSE; // scan subdirectories of the EFI directory (as per the standard) DirIterOpen(Volume->RootDir, L"EFI", &EfiDirIter); while (DirIterNext(&EfiDirIter, 1, NULL, &EfiDirEntry)) { if (StriCmp(EfiDirEntry->FileName, L"tools") == 0 || EfiDirEntry->FileName[0] == '.') - continue; // skip this, doesn't contain boot loaders + continue; // skip this, doesn't contain boot loaders or is scanned later SPrint(FileName, 255, L"EFI\\%s", EfiDirEntry->FileName); - ScanLoaderDir(Volume, FileName, MatchPatterns); + if (ScanLoaderDir(Volume, FileName, MatchPatterns)) + ScanFallbackLoader = FALSE; } // while() Status = DirIterClose(&EfiDirIter); if (Status != EFI_NOT_FOUND) @@ -1041,18 +1521,27 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { // Scan user-specified (or additional default) directories.... i = 0; while ((Directory = FindCommaDelimited(GlobalConfig.AlsoScan, i++)) != NULL) { - VolNum = VOL_DONTSCAN; - SplitVolumeAndFilename(&Directory, &VolName); - CleanUpPathNameSlashes(Directory); - Length = StrLen(Directory); - if (VolName && (Length > 0) && (StrLen(VolName) > 2) && (VolName[0] == L'f') && (VolName[1] == L's') && - (VolName[2] >= L'0') && (VolName[2] <= L'9')) - VolNum = Atoi(VolName + 2); - if ((Length > 0) && ((VolName == NULL) || (StriCmp(VolName, Volume->VolName) == 0) || (Volume->VolNumber == VolNum))) - ScanLoaderDir(Volume, Directory, MatchPatterns); + if (ShouldScan(Volume, Directory)) { + SplitVolumeAndFilename(&Directory, &VolName); + CleanUpPathNameSlashes(Directory); + Length = StrLen(Directory); + if ((Length > 0) && ScanLoaderDir(Volume, Directory, MatchPatterns)) + ScanFallbackLoader = FALSE; + MyFreePool(VolName); + } // if should scan dir MyFreePool(Directory); - MyFreePool(VolName); } // while + + // Don't scan the fallback loader if it's on the same volume and a duplicate of rEFInd itself.... + SelfPath = DevicePathToStr(SelfLoadedImage->FilePath); + CleanUpPathNameSlashes(SelfPath); + if ((Volume->DeviceHandle == SelfLoadedImage->DeviceHandle) && DuplicatesFallback(Volume, SelfPath)) + ScanFallbackLoader = FALSE; + + // If not a duplicate & if it exists & if it's not us, create an entry + // for the fallback boot loader + if (ScanFallbackLoader && FileExists(Volume->RootDir, FALLBACK_FULLNAME) && ShouldScan(Volume, L"EFI\\BOOT")) + AddLoaderEntry(FALLBACK_FULLNAME, L"Fallback boot loader", Volume); } // if } // static VOID ScanEfiFiles() @@ -1247,7 +1736,7 @@ static EFI_DEVICE_PATH *LegacyLoaderList[] = { #define MAX_DISCOVERED_PATHS (16) -static VOID StartLegacy(IN LEGACY_ENTRY *Entry) +static VOID StartLegacy(IN LEGACY_ENTRY *Entry, IN CHAR16 *SelectionName) { EFI_STATUS Status; EG_IMAGE *BootLogoImage; @@ -1269,7 +1758,8 @@ static VOID StartLegacy(IN LEGACY_ENTRY *Entry) ExtractLegacyLoaderPaths(DiscoveredPathList, MAX_DISCOVERED_PATHS, LegacyLoaderList); - Status = StartEFIImageList(DiscoveredPathList, Entry->LoadOptions, NULL, L"legacy loader", 0, &ErrorInStep, TRUE); + StoreLoaderName(SelectionName); + Status = StartEFIImageList(DiscoveredPathList, Entry->LoadOptions, TYPE_LEGACY, L"legacy loader", 0, &ErrorInStep, TRUE, FALSE); if (Status == EFI_NOT_FOUND) { if (ErrorInStep == 1) { Print(L"\nPlease make sure that you have the latest firmware update installed.\n"); @@ -1282,10 +1772,10 @@ static VOID StartLegacy(IN LEGACY_ENTRY *Entry) } /* static VOID StartLegacy() */ // Start a device on a non-Mac using the EFI_LEGACY_BIOS_PROTOCOL -#ifdef __MAKEWITH_TIANO -static VOID StartLegacyUEFI(IN LEGACY_ENTRY *Entry) +static VOID StartLegacyUEFI(LEGACY_ENTRY *Entry, CHAR16 *SelectionName) { BeginExternalScreen(TRUE, L"Booting Legacy OS (UEFI mode)"); + StoreLoaderName(SelectionName); BdsLibConnectDevicePath (Entry->BdsOption->DevicePath); BdsLibDoLegacyBoot(Entry->BdsOption); @@ -1295,13 +1785,12 @@ static VOID StartLegacyUEFI(IN LEGACY_ENTRY *Entry) PauseForKey(); FinishExternalScreen(); } // static VOID StartLegacyUEFI() -#endif // __MAKEWITH_TIANO static LEGACY_ENTRY * AddLegacyEntry(IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Volume) { LEGACY_ENTRY *Entry, *SubEntry; REFIT_MENU_SCREEN *SubScreen; - CHAR16 *VolDesc; + CHAR16 *VolDesc, *LegacyTitle; CHAR16 ShortcutLetter = 0; if (LoaderTitle == NULL) { @@ -1317,10 +1806,17 @@ static LEGACY_ENTRY * AddLegacyEntry(IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Vo else VolDesc = (Volume->DiskKind == DISK_KIND_OPTICAL) ? L"CD" : L"HD"; + LegacyTitle = AllocateZeroPool(256 * sizeof(CHAR16)); + if (LegacyTitle != NULL) + SPrint(LegacyTitle, 255, L"Boot %s from %s", LoaderTitle, VolDesc); + if (IsInSubstring(LegacyTitle, GlobalConfig.DontScanVolumes)) { + MyFreePool(LegacyTitle); + return NULL; + } // if + // prepare the menu entry Entry = AllocateZeroPool(sizeof(LEGACY_ENTRY)); - Entry->me.Title = AllocateZeroPool(256 * sizeof(CHAR16)); - SPrint(Entry->me.Title, 255, L"Boot %s from %s", LoaderTitle, VolDesc); + Entry->me.Title = LegacyTitle; Entry->me.Tag = TAG_LEGACY; Entry->me.Row = 0; Entry->me.ShortcutLetter = ShortcutLetter; @@ -1328,7 +1824,7 @@ static LEGACY_ENTRY * AddLegacyEntry(IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Vo Entry->me.BadgeImage = Volume->VolBadgeImage; Entry->Volume = Volume; Entry->LoadOptions = (Volume->DiskKind == DISK_KIND_OPTICAL) ? L"CD" : - ((Volume->DiskKind == DISK_KIND_EXTERNAL) ? L"USB" : L"HD"); + ((Volume->DiskKind == DISK_KIND_EXTERNAL) ? L"USB" : L"HD"); Entry->Enabled = TRUE; // create the submenu @@ -1359,9 +1855,6 @@ static LEGACY_ENTRY * AddLegacyEntry(IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Vo } /* static LEGACY_ENTRY * AddLegacyEntry() */ -#ifdef __MAKEWITH_GNUEFI -static VOID ScanLegacyUEFI(IN UINTN DiskType){} -#else // default volume badge icon based on disk kind static EG_IMAGE * GetDiskBadge(IN UINTN DiskType) { EG_IMAGE * Badge = NULL; @@ -1388,9 +1881,15 @@ static LEGACY_ENTRY * AddLegacyEntryUEFI(BDS_COMMON_OPTION *BdsOption, IN UINT16 LEGACY_ENTRY *Entry, *SubEntry; REFIT_MENU_SCREEN *SubScreen; CHAR16 ShortcutLetter = 0; - CHAR16 *LegacyDescription = BdsOption->Description; + CHAR16 *LegacyDescription = StrDuplicate(BdsOption->Description); + + if (IsInSubstring(LegacyDescription, GlobalConfig.DontScanVolumes)) + return NULL; -// ScanVolume(Volume); + // Remove stray spaces, since many EFIs produce descriptions with lots of + // extra spaces, especially at the end; this throws off centering of the + // description on the screen.... + LimitStringLength(LegacyDescription, 100); // prepare the menu entry Entry = AllocateZeroPool(sizeof(LEGACY_ENTRY)); @@ -1403,7 +1902,6 @@ static LEGACY_ENTRY * AddLegacyEntryUEFI(BDS_COMMON_OPTION *BdsOption, IN UINT16 Entry->LoadOptions = (DiskType == BBS_CDROM) ? L"CD" : ((DiskType == BBS_USB) ? L"USB" : L"HD"); Entry->me.BadgeImage = GetDiskBadge(DiskType); -// Entry->me.BadgeImage = Volume->VolBadgeImage; Entry->BdsOption = BdsOption; Entry->Enabled = TRUE; @@ -1447,19 +1945,28 @@ static VOID ScanLegacyUEFI(IN UINTN DiskType) UINTN Index = 0; CHAR16 BootOption[10]; UINTN BootOrderSize = 0; - CHAR16 Buffer[20]; - BDS_COMMON_OPTION *BdsOption; - LIST_ENTRY TempList; - BBS_BBS_DEVICE_PATH * BbsDevicePath = NULL; + CHAR16 Buffer[20]; + BDS_COMMON_OPTION *BdsOption; + LIST_ENTRY TempList; + BBS_BBS_DEVICE_PATH *BbsDevicePath = NULL; + BOOLEAN SearchingForUsb = FALSE; InitializeListHead (&TempList); ZeroMem (Buffer, sizeof (Buffer)); // If LegacyBios protocol is not implemented on this platform, then //we do not support this type of legacy boot on this machine. - Status = gBS->LocateProtocol(&gEfiLegacyBootProtocolGuid, NULL, (VOID **) &LegacyBios); + Status = refit_call3_wrapper(gBS->LocateProtocol, &gEfiLegacyBootProtocolGuid, NULL, (VOID **) &LegacyBios); if (EFI_ERROR (Status)) - return; + return; + + // EFI calls USB drives BBS_HARDDRIVE, but we want to distinguish them, + // so we set DiskType inappropriately elsewhere in the program and + // "translate" it here. + if (DiskType == BBS_USB) { + DiskType = BBS_HARDDISK; + SearchingForUsb = TRUE; + } // if // Grab the boot order BootOrder = BdsLibGetVariableAndSize(L"BootOrder", &gEfiGlobalVariableGuid, &BootOrderSize); @@ -1477,20 +1984,28 @@ static VOID ScanLegacyUEFI(IN UINTN DiskType) if (BdsOption != NULL) { BbsDevicePath = (BBS_BBS_DEVICE_PATH *)BdsOption->DevicePath; - // Only add the entry if it is of a requested type (e.g. USB, HD) - // Two checks necessary because some systems return EFI boot loaders // with a DeviceType value that would inappropriately include them // as legacy loaders.... if ((BbsDevicePath->DeviceType == DiskType) && (BdsOption->DevicePath->Type == DEVICE_TYPE_BIOS)) { - AddLegacyEntryUEFI(BdsOption, BbsDevicePath->DeviceType); - } - } + // USB flash drives appear as hard disks with certain media flags set. + // Look for this, and if present, pass it on with the (technically + // incorrect, but internally useful) BBS_TYPE_USB flag set. + if (DiskType == BBS_HARDDISK) { + if (SearchingForUsb && (BbsDevicePath->StatusFlag & (BBS_MEDIA_PRESENT | BBS_MEDIA_MAYBE_PRESENT))) { + AddLegacyEntryUEFI(BdsOption, BBS_USB); + } else if (!SearchingForUsb && !(BbsDevicePath->StatusFlag & (BBS_MEDIA_PRESENT | BBS_MEDIA_MAYBE_PRESENT))) { + AddLegacyEntryUEFI(BdsOption, DiskType); + } + } else { + AddLegacyEntryUEFI(BdsOption, DiskType); + } // if/else + } // if + } // if (BdsOption != NULL) Index++; - } + } // while } /* static VOID ScanLegacyUEFI() */ -#endif // __MAKEWITH_GNUEFI static VOID ScanLegacyVolume(REFIT_VOLUME *Volume, UINTN VolumeIndex) { UINTN VolumeIndex2; @@ -1513,7 +2028,7 @@ static VOID ScanLegacyVolume(REFIT_VOLUME *Volume, UINTN VolumeIndex) { // check for other bootable entries on the same disk for (VolumeIndex2 = 0; VolumeIndex2 < VolumesCount; VolumeIndex2++) { if (VolumeIndex2 != VolumeIndex && Volumes[VolumeIndex2]->HasBootCode && - Volumes[VolumeIndex2]->WholeDiskBlockIO == Volume->WholeDiskBlockIO) + Volumes[VolumeIndex2]->WholeDiskBlockIO == Volume->WholeDiskBlockIO) ShowVolume = FALSE; } } @@ -1554,6 +2069,8 @@ static VOID ScanLegacyInternal(VOID) ScanLegacyVolume(Volume, VolumeIndex); } // for } else if (GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) { + // TODO: This actually picks up USB flash drives, too; try to find + // a way to differentiate the two.... ScanLegacyUEFI(BBS_HARDDISK); } } /* static VOID ScanLegacyInternal() */ @@ -1572,6 +2089,8 @@ static VOID ScanLegacyExternal(VOID) ScanLegacyVolume(Volume, VolumeIndex); } // for } else if (GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) { + // TODO: This actually doesn't do anything useful; leaving in hopes of + // fixing it later.... ScanLegacyUEFI(BBS_USB); } } /* static VOID ScanLegacyExternal() */ @@ -1583,8 +2102,9 @@ static VOID ScanLegacyExternal(VOID) static VOID StartTool(IN LOADER_ENTRY *Entry) { BeginExternalScreen(Entry->UseGraphicsMode, Entry->me.Title + 6); // assumes "Start " as assigned below - StartEFIImage(Entry->DevicePath, Entry->LoadOptions, Basename(Entry->LoaderPath), - Basename(Entry->LoaderPath), Entry->OSType, NULL, TRUE); + StoreLoaderName(Entry->me.Title); + StartEFIImage(Entry->DevicePath, Entry->LoadOptions, TYPE_EFI, + Basename(Entry->LoaderPath), Entry->OSType, NULL, TRUE, FALSE); FinishExternalScreen(); } /* static VOID StartTool() */ @@ -1596,8 +2116,7 @@ static LOADER_ENTRY * AddToolEntry(EFI_HANDLE DeviceHandle, IN CHAR16 *LoaderPat Entry = AllocateZeroPool(sizeof(LOADER_ENTRY)); - MergeStrings(&TitleStr, L"Start ", 0); - MergeStrings(&TitleStr, LoaderTitle, 0); + TitleStr = PoolPrint(L"Start %s", LoaderTitle); Entry->me.Title = TitleStr; Entry->me.Tag = TAG_TOOL; Entry->me.Row = 1; @@ -1633,7 +2152,7 @@ static UINTN ScanDriverDir(IN CHAR16 *Path) SPrint(FileName, 255, L"%s\\%s", Path, DirEntry->FileName); NumFound++; Status = StartEFIImage(FileDevicePath(SelfLoadedImage->DeviceHandle, FileName), - L"", DirEntry->FileName, DirEntry->FileName, 0, NULL, FALSE); + L"", TYPE_EFI, DirEntry->FileName, 0, NULL, FALSE, TRUE); } Status = DirIterClose(&DirIter); if (Status != EFI_NOT_FOUND) { @@ -1755,20 +2274,15 @@ static VOID LoadDrivers(VOID) // Determine what (if any) type of legacy (BIOS) boot support is available static VOID FindLegacyBootType(VOID) { -#ifdef __MAKEWITH_TIANO EFI_STATUS Status; EFI_LEGACY_BIOS_PROTOCOL *LegacyBios; -#endif GlobalConfig.LegacyType = LEGACY_TYPE_NONE; - // UEFI-style legacy BIOS support is available only with the TianoCore EDK2 - // build environment, and then only with some EFI implementations.... -#ifdef __MAKEWITH_TIANO - Status = gBS->LocateProtocol (&gEfiLegacyBootProtocolGuid, NULL, (VOID **) &LegacyBios); + // UEFI-style legacy BIOS support is available only with some EFI implementations.... + Status = refit_call3_wrapper(gBS->LocateProtocol, &gEfiLegacyBootProtocolGuid, NULL, (VOID **) &LegacyBios); if (!EFI_ERROR (Status)) GlobalConfig.LegacyType = LEGACY_TYPE_UEFI; -#endif // Macs have their own system. If the firmware vendor code contains the // string "Apple", assume it's available. Note that this overrides the @@ -1779,30 +2293,24 @@ static VOID FindLegacyBootType(VOID) { GlobalConfig.LegacyType = LEGACY_TYPE_MAC; } // static VOID FindLegacyBootType -// Warn the user if legacy OS scans are enabled but the firmware or this -// application can't support them.... -static VOID WarnIfLegacyProblems() { +// Warn the user if legacy OS scans are enabled but the firmware can't support them.... +static VOID WarnIfLegacyProblems(VOID) { BOOLEAN found = FALSE; UINTN i = 0; if (GlobalConfig.LegacyType == LEGACY_TYPE_NONE) { do { - if (GlobalConfig.ScanFor[i] == 'h' || GlobalConfig.ScanFor[i] == 'b' || GlobalConfig.ScanFor[i] == 'c') + if (GlobalConfig.ScanFor[i] == 'h' || GlobalConfig.ScanFor[i] == 'b' || GlobalConfig.ScanFor[i] == 'c' || + GlobalConfig.ScanFor[i] == 'H' || GlobalConfig.ScanFor[i] == 'B' || GlobalConfig.ScanFor[i] == 'C') found = TRUE; i++; } while ((i < NUM_SCAN_OPTIONS) && (!found)); + if (found) { Print(L"NOTE: refind.conf's 'scanfor' line specifies scanning for one or more legacy\n"); - Print(L"(BIOS) boot options; however, this is not possible because "); -#ifdef __MAKEWITH_TIANO - Print(L"your computer lacks\n"); - Print(L"the necessary Compatibility Support Module (CSM) support.\n"); -#else - Print(L"this program was\n"); - Print(L"compiled without the necessary support. Please visit\n"); - Print(L"http://www.rodsbooks.com/refind/getting.html and download and install a rEFInd\n"); - Print(L"binary built with the TianoCore EDK2 to enable legacy boot support.\n"); -#endif + Print(L"(BIOS) boot options; however, this is not possible because your computer lacks\n"); + Print(L"the necessary Compatibility Support Module (CSM) support or that support is\n"); + Print(L"disabled in your firmware.\n"); PauseForKey(); } // if (found) } // if no legacy support @@ -1810,9 +2318,22 @@ static VOID WarnIfLegacyProblems() { // Locates boot loaders. NOTE: This assumes that GlobalConfig.LegacyType is set correctly. static VOID ScanForBootloaders(VOID) { - UINTN i; + UINTN i; + CHAR8 s; + BOOLEAN ScanForLegacy = FALSE; - ScanVolumes(); + // Determine up-front if we'll be scanning for legacy loaders.... + for (i = 0; i < NUM_SCAN_OPTIONS; i++) { + s = GlobalConfig.ScanFor[i]; + if ((s == 'c') || (s == 'C') || (s == 'h') || (s == 'H') || (s == 'b') || (s == 'B')) + ScanForLegacy = TRUE; + } // for + + // If UEFI & scanning for legacy loaders & deep legacy scan, update NVRAM boot manager list + if ((GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) && ScanForLegacy && GlobalConfig.DeepLegacyScan) { + BdsDeleteAllInvalidLegacyBootOptions(); + BdsAddNonExistingLegacyBootOptions(); + } // if // scan for loaders and tools, add them to the menu for (i = 0; i < NUM_SCAN_OPTIONS; i++) { @@ -1827,7 +2348,7 @@ static VOID ScanForBootloaders(VOID) { ScanLegacyExternal(); break; case 'm': case 'M': - ScanUserConfigured(); + ScanUserConfigured(GlobalConfig.ConfigFilename); break; case 'e': case 'E': ScanExternal(); @@ -1838,6 +2359,9 @@ static VOID ScanForBootloaders(VOID) { case 'o': case 'O': ScanOptical(); break; + case 'n': case 'N': + ScanNetboot(); + break; } // switch() } // for @@ -1849,103 +2373,186 @@ static VOID ScanForBootloaders(VOID) { FinishTextScreen(FALSE); } // static VOID ScanForBootloaders() +// Locate a single tool from the specified Locations using one of the +// specified Names and add it to the menu. +static VOID FindTool(CHAR16 *Locations, CHAR16 *Names, CHAR16 *Description, UINTN Icon) { + UINTN j = 0, k, VolumeIndex; + CHAR16 *DirName, *FileName, *PathName, FullDescription[256]; + + while ((DirName = FindCommaDelimited(Locations, j++)) != NULL) { + k = 0; + while ((FileName = FindCommaDelimited(Names, k++)) != NULL) { + PathName = StrDuplicate(DirName); + MergeStrings(&PathName, FileName, (StriCmp(PathName, L"\\") == 0) ? 0 : L'\\'); + for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) { + if ((Volumes[VolumeIndex]->RootDir != NULL) && (FileExists(Volumes[VolumeIndex]->RootDir, PathName))) { + SPrint(FullDescription, 255, L"%s at %s on %s", Description, PathName, Volumes[VolumeIndex]->VolName); + AddToolEntry(Volumes[VolumeIndex]->DeviceHandle, PathName, FullDescription, BuiltinIcon(Icon), 'S', FALSE); + } // if + } // for + MyFreePool(PathName); + MyFreePool(FileName); + } // while Names + MyFreePool(DirName); + } // while Locations +} // VOID FindTool() + // Add the second-row tags containing built-in and external tools (EFI shell, // reboot, etc.) static VOID ScanForTools(VOID) { - CHAR16 *FileName = NULL, Description[256]; + CHAR16 *FileName = NULL, *VolName = NULL, *MokLocations, Description[256]; REFIT_MENU_ENTRY *TempMenuEntry; UINTN i, j, VolumeIndex; + UINT64 osind; + CHAR8 *b = 0; + + MokLocations = StrDuplicate(MOK_LOCATIONS); + if (MokLocations != NULL) + MergeStrings(&MokLocations, SelfDirPath, L','); for (i = 0; i < NUM_TOOLS; i++) { switch(GlobalConfig.ShowTools[i]) { + // NOTE: Be sure that FileName is NULL at the end of each case. case TAG_SHUTDOWN: TempMenuEntry = CopyMenuEntry(&MenuEntryShutdown); TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_SHUTDOWN); AddMenuEntry(&MainMenu, TempMenuEntry); break; + case TAG_REBOOT: TempMenuEntry = CopyMenuEntry(&MenuEntryReset); TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_RESET); AddMenuEntry(&MainMenu, TempMenuEntry); break; + case TAG_ABOUT: TempMenuEntry = CopyMenuEntry(&MenuEntryAbout); TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); AddMenuEntry(&MainMenu, TempMenuEntry); break; + case TAG_EXIT: TempMenuEntry = CopyMenuEntry(&MenuEntryExit); TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_EXIT); AddMenuEntry(&MainMenu, TempMenuEntry); break; + + case TAG_FIRMWARE: + if (EfivarGetRaw(&GlobalGuid, L"OsIndicationsSupported", &b, &j) == EFI_SUCCESS) { + osind = (UINT64)*b; + if (osind & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) { + TempMenuEntry = CopyMenuEntry(&MenuEntryFirmware); + TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_FIRMWARE); + AddMenuEntry(&MainMenu, TempMenuEntry); + } // if + } // if + break; + case TAG_SHELL: j = 0; - MyFreePool(FileName); while ((FileName = FindCommaDelimited(SHELL_NAMES, j++)) != NULL) { if (FileExists(SelfRootDir, FileName)) { AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"EFI Shell", BuiltinIcon(BUILTIN_ICON_TOOL_SHELL), 'S', FALSE); } + MyFreePool(FileName); } // while break; + case TAG_GPTSYNC: - MyFreePool(FileName); - FileName = StrDuplicate(L"\\efi\\tools\\gptsync.efi"); -// MergeStrings(&FileName, L"\\efi\\tools\\gptsync.efi", 0); - if (FileExists(SelfRootDir, FileName)) { - AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"Make Hybrid MBR", BuiltinIcon(BUILTIN_ICON_TOOL_PART), 'P', FALSE); - } + j = 0; + while ((FileName = FindCommaDelimited(GPTSYNC_NAMES, j++)) != NULL) { + if (FileExists(SelfRootDir, FileName)) { + AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"Hybrid MBR tool", BuiltinIcon(BUILTIN_ICON_TOOL_PART), + 'P', FALSE); + } // if + MyFreePool(FileName); + } // while + FileName = NULL; break; + + case TAG_GDISK: + j = 0; + while ((FileName = FindCommaDelimited(GDISK_NAMES, j++)) != NULL) { + if (FileExists(SelfRootDir, FileName)) { + AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"disk partitioning tool", + BuiltinIcon(BUILTIN_ICON_TOOL_PART), 'G', FALSE); + } // if + MyFreePool(FileName); + } // while + FileName = NULL; + break; + + case TAG_NETBOOT: + j = 0; + while ((FileName = FindCommaDelimited(NETBOOT_NAMES, j++)) != NULL) { + if (FileExists(SelfRootDir, FileName)) { + AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"Netboot", + BuiltinIcon(BUILTIN_ICON_TOOL_NETBOOT), 'N', FALSE); + } // if + MyFreePool(FileName); + } // while + FileName = NULL; + break; + case TAG_APPLE_RECOVERY: - MyFreePool(FileName); FileName = StrDuplicate(L"\\com.apple.recovery.boot\\boot.efi"); -// MergeStrings(&FileName, L"\\com.apple.recovery.boot\\boot.efi", 0); for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) { if ((Volumes[VolumeIndex]->RootDir != NULL) && (FileExists(Volumes[VolumeIndex]->RootDir, FileName))) { SPrint(Description, 255, L"Apple Recovery on %s", Volumes[VolumeIndex]->VolName); AddToolEntry(Volumes[VolumeIndex]->DeviceHandle, FileName, Description, BuiltinIcon(BUILTIN_ICON_TOOL_APPLE_RESCUE), 'R', TRUE); - } + } // if } // for + MyFreePool(FileName); + FileName = NULL; break; - case TAG_MOK_TOOL: + + case TAG_WINDOWS_RECOVERY: j = 0; - MyFreePool(FileName); - while ((FileName = FindCommaDelimited(MOK_NAMES, j++)) != NULL) { - if (FileExists(SelfRootDir, FileName)) { - SPrint(Description, 255, L"MOK Key Manager at %s", FileName); - AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, Description, - BuiltinIcon(BUILTIN_ICON_TOOL_MOK_TOOL), 'S', FALSE); - } + while ((FileName = FindCommaDelimited(GlobalConfig.WindowsRecoveryFiles, j++)) != NULL) { + SplitVolumeAndFilename(&FileName, &VolName); + for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) { + if ((Volumes[VolumeIndex]->RootDir != NULL) && (FileExists(Volumes[VolumeIndex]->RootDir, FileName)) && + ((VolName == NULL) || (StriCmp(VolName, Volumes[VolumeIndex]->VolName) == 0))) { + SPrint(Description, 255, L"Microsoft Recovery on %s", Volumes[VolumeIndex]->VolName); + AddToolEntry(Volumes[VolumeIndex]->DeviceHandle, FileName, Description, + BuiltinIcon(BUILTIN_ICON_TOOL_WINDOWS_RESCUE), 'R', TRUE); + } // if + } // for } // while - if (FileExists(SelfDir, L"MokManager.efi")) { - MyFreePool(FileName); - FileName = StrDuplicate(SelfDirPath); - MergeStrings(&FileName, L"\\MokManager.efi", 0); - SPrint(Description, 255, L"MOK Key Manager at %s", FileName); - AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, Description, - BuiltinIcon(BUILTIN_ICON_TOOL_MOK_TOOL), 'S', FALSE); - } + MyFreePool(FileName); + FileName = NULL; + MyFreePool(VolName); + VolName = NULL; + break; + + case TAG_MOK_TOOL: + FindTool(MokLocations, MOK_NAMES, L"MOK utility", BUILTIN_ICON_TOOL_MOK_TOOL); + break; + + case TAG_MEMTEST: + FindTool(MEMTEST_LOCATIONS, MEMTEST_NAMES, L"Memory test utility", BUILTIN_ICON_TOOL_MEMTEST); break; + } // switch() - MyFreePool(FileName); - FileName = NULL; } // for } // static VOID ScanForTools // Rescan for boot loaders -VOID RescanAll(VOID) { +static VOID RescanAll(BOOLEAN DisplayMessage) { EG_PIXEL BGColor; BGColor.b = 255; BGColor.g = 175; BGColor.r = 100; BGColor.a = 0; - egDisplayMessage(L"Scanning for new boot loaders; please wait....", &BGColor); + if (DisplayMessage) + egDisplayMessage(L"Scanning for new boot loaders; please wait....", &BGColor); FreeList((VOID ***) &(MainMenu.Entries), &MainMenu.EntryCount); MainMenu.Entries = NULL; MainMenu.EntryCount = 0; - ReadConfig(CONFIG_FILE_NAME); + ReadConfig(GlobalConfig.ConfigFilename); ConnectAllDriversToAllControllers(); ScanVolumes(); ScanForBootloaders(); @@ -1964,7 +2571,7 @@ static VOID InitializeLib(IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *System gRT = SystemTable->RuntimeServices; // Some BDS functions need gRT to be set EfiGetSystemConfigurationTable (&gEfiDxeServicesTableGuid, (VOID **) &gDS); - InitializeConsoleSim(); +// InitializeConsoleSim(); } #endif @@ -2005,6 +2612,36 @@ static BOOLEAN SecureBootUninstall(VOID) { return Success; } // VOID SecureBootUninstall +// Sets the global configuration filename; will be CONFIG_FILE_NAME unless the +// "-c" command-line option is set, in which case that takes precedence. +// If an error is encountered, leaves the value alone (it should be set to +// CONFIG_FILE_NAME when GlobalConfig is initialized). +static VOID SetConfigFilename(EFI_HANDLE ImageHandle) { + EFI_LOADED_IMAGE *Info; + CHAR16 *Options, *FileName; + EFI_STATUS Status; + INTN Where; + + Status = refit_call3_wrapper(BS->HandleProtocol, ImageHandle, &LoadedImageProtocol, (VOID **) &Info); + if ((Status == EFI_SUCCESS) && (Info->LoadOptionsSize > 0)) { + Options = (CHAR16 *) Info->LoadOptions; + Where = FindSubString(L" -c ", Options); + if (Where >= 0) { + FileName = StrDuplicate(&Options[Where + 4]); + Where = FindSubString(L" ", FileName); + if (Where > 0) + FileName[Where] = L'\0'; + + if (FileExists(SelfDir, FileName)) { + GlobalConfig.ConfigFilename = FileName; + } else { + Print(L"Specified configuration file (%s) doesn't exist; using\n'refind.conf' default\n", FileName); + MyFreePool(FileName); + } // if/else + } // if + } // if +} // VOID SetConfigFilename() + // // main entry point // @@ -2017,7 +2654,7 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) BOOLEAN MokProtocol; REFIT_MENU_ENTRY *ChosenEntry; UINTN MenuExit, i; - CHAR16 *Selection; + CHAR16 *SelectionName = NULL; EG_PIXEL BGColor; // bootstrap @@ -2031,8 +2668,8 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) FindLegacyBootType(); if (GlobalConfig.LegacyType == LEGACY_TYPE_MAC) CopyMem(GlobalConfig.ScanFor, "ihebocm ", NUM_SCAN_OPTIONS); - ScanVolumes(); - ReadConfig(CONFIG_FILE_NAME); + SetConfigFilename(ImageHandle); + ReadConfig(GlobalConfig.ConfigFilename); InitScreen(); WarnIfLegacyProblems(); @@ -2042,31 +2679,35 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) refit_call4_wrapper(BS->SetWatchdogTimer, 0x0000, 0x0000, 0x0000, NULL); // further bootstrap (now with config available) - SetupScreen(); MokProtocol = SecureBootSetup(); -// ScanVolumes(); LoadDrivers(); + ScanVolumes(); ScanForBootloaders(); ScanForTools(); + SetupScreen(); if (GlobalConfig.ScanDelay > 0) { BGColor.b = 255; BGColor.g = 175; BGColor.r = 100; BGColor.a = 0; - egDisplayMessage(L"Pausing before disk scan; please wait....", &BGColor); + if (GlobalConfig.ScanDelay > 1) + egDisplayMessage(L"Pausing before disk scan; please wait....", &BGColor); for (i = 0; i < GlobalConfig.ScanDelay; i++) refit_call1_wrapper(BS->Stall, 1000000); - RescanAll(); + RescanAll(GlobalConfig.ScanDelay > 1); } // if - Selection = StrDuplicate(GlobalConfig.DefaultSelection); + if (GlobalConfig.DefaultSelection) + SelectionName = StrDuplicate(GlobalConfig.DefaultSelection); + while (MainLoopRunning) { - MenuExit = RunMainMenu(&MainMenu, Selection, &ChosenEntry); + MenuExit = RunMainMenu(&MainMenu, &SelectionName, &ChosenEntry); // The Escape key triggers a re-scan operation.... if (MenuExit == MENU_EXIT_ESCAPE) { - RescanAll(); + MenuExit = 0; + RescanAll(TRUE); continue; } @@ -2089,18 +2730,16 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) break; case TAG_LOADER: // Boot OS via .EFI loader - StartLoader((LOADER_ENTRY *)ChosenEntry); + StartLoader((LOADER_ENTRY *)ChosenEntry, SelectionName); break; case TAG_LEGACY: // Boot legacy OS - StartLegacy((LEGACY_ENTRY *)ChosenEntry); + StartLegacy((LEGACY_ENTRY *)ChosenEntry, SelectionName); break; -#ifdef __MAKEWITH_TIANO case TAG_LEGACY_UEFI: // Boot a legacy OS on a non-Mac - StartLegacyUEFI((LEGACY_ENTRY *)ChosenEntry); + StartLegacyUEFI((LEGACY_ENTRY *)ChosenEntry, SelectionName); break; -#endif case TAG_TOOL: // Start a EFI tool StartTool((LOADER_ENTRY *)ChosenEntry); @@ -2115,9 +2754,11 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) } break; + case TAG_FIRMWARE: // Reboot into firmware's user interface + RebootIntoFirmware(); + break; + } // switch() - MyFreePool(Selection); - Selection = (ChosenEntry->Title) ? StrDuplicate(ChosenEntry->Title) : NULL; } // while() // If we end up here, things have gone wrong. Try to reboot, and if that