X-Git-Url: https://code.delx.au/refind/blobdiff_plain/11fa7da805c3e263f8b05339f1900baa73a2ffd4..d738a7a9d29a6a09673f1d9cad6155c07d0d3875:/refind/main.c diff --git a/refind/main.c b/refind/main.c index 7ea5571..3f40c12 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-2014 Roderick W. Smith + * Modifications copyright (c) 2012-2015 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 @@ -45,40 +45,43 @@ #include "global.h" #include "config.h" #include "screen.h" +#include "legacy.h" #include "lib.h" #include "icns.h" #include "menu.h" #include "mok.h" #include "gpt.h" #include "security_policy.h" +#include "driver_support.h" #include "../include/Handle.h" #include "../include/refit_call_wrapper.h" -#include "driver_support.h" -#include "../include/syslinux_mbr.h" +#include "../EfiLib/BdsHelper.h" +#include "../EfiLib/legacy.h" #ifdef __MAKEWITH_GNUEFI #ifndef EFI_SECURITY_VIOLATION #define EFI_SECURITY_VIOLATION EFIERR (26) #endif #endif -//#else -#include "../EfiLib/BdsHelper.h" -#include "../EfiLib/legacy.h" #ifndef EFI_OS_INDICATIONS_BOOT_TO_FW_UI #define EFI_OS_INDICATIONS_BOOT_TO_FW_UI 0x0000000000000001ULL -#else +#endif + +#ifdef __MAKEWITH_TIANO #define LibLocateHandle gBS->LocateHandleBuffer #endif // // constants -#define MACOSX_LOADER_PATH L"System\\Library\\CoreServices\\boot.efi" +#define MACOSX_LOADER_DIR L"System\\Library\\CoreServices" +#define MACOSX_LOADER_PATH ( MACOSX_LOADER_DIR L"\\boot.efi" ) #if defined (EFIX64) #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" @@ -88,6 +91,7 @@ #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" @@ -97,6 +101,7 @@ #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 */ @@ -104,6 +109,9 @@ #endif #define FAT_ARCH 0x0ef1fab9 /* ID for Apple "fat" binary */ +#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 // comparison when it should do a case-insensitive comparison, so I'm doubling this up. It does @@ -116,35 +124,27 @@ // a ".efi" extension to be found when scanning for boot loaders. #define LINUX_MATCH_PATTERNS L"vmlinuz*,bzImage*" -// Default hint text for program-launch submenus -#define SUBSCREEN_HINT1 L"Use arrow keys to move cursor; Enter to boot;" -#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, 1, 0, 0, NULL, NULL, NULL }; +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" }; +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, 0, - { DEFAULT_BIG_ICON_SIZE / 4, DEFAULT_SMALL_ICON_SIZE, DEFAULT_BIG_ICON_SIZE }, BANNER_NOSCALE, +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 } + 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; @@ -166,17 +166,18 @@ static VOID AboutrEFInd(VOID) if (AboutMenu.EntryCount == 0) { AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); - AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.0.3"); + AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.7.3"); AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer"); - AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2014 Roderick W. Smith"); + AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2015 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:"); 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)"); + AddMenuInfoLine(&AboutMenu, PoolPrint(L" Platform: x86 (32 bit); Secure Boot %s", + secure_mode() ? L"active" : L"inactive")); #elif defined(EFIX64) AddMenuInfoLine(&AboutMenu, PoolPrint(L" Platform: x86_64 (64 bit); Secure Boot %s", secure_mode() ? L"active" : L"inactive")); @@ -260,11 +261,12 @@ static BOOLEAN IsValidLoader(EFI_FILE *RootDir, CHAR16 *FileName) { } // BOOLEAN IsValidLoader() // Launch an EFI binary. -static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths, - IN CHAR16 *LoadOptions, IN UINTN LoaderType, - IN CHAR16 *ImageTitle, IN CHAR8 OSType, - OUT UINTN *ErrorInStep, - IN BOOLEAN Verbose) +EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths, + IN CHAR16 *LoadOptions, IN UINTN LoaderType, + IN CHAR16 *ImageTitle, IN CHAR8 OSType, + OUT UINTN *ErrorInStep, + IN BOOLEAN Verbose, + IN BOOLEAN IsDriver) { EFI_STATUS Status, ReturnStatus; EFI_HANDLE ChildImageHandle; @@ -363,59 +365,29 @@ 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); return ReturnStatus; -} /* static EFI_STATUS StartEFIImageList() */ +} /* EFI_STATUS StartEFIImageList() */ static EFI_STATUS StartEFIImage(IN EFI_DEVICE_PATH *DevicePath, 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, LoaderType, ImageTitle, OSType, ErrorInStep, Verbose); + return StartEFIImageList(DevicePaths, LoadOptions, LoaderType, ImageTitle, OSType, ErrorInStep, Verbose, IsDriver); } /* static EFI_STATUS StartEFIImage() */ -// From gummiboot: Retrieve a raw EFI variable. -// Returns EFI status -static EFI_STATUS EfivarGetRaw(EFI_GUID *vendor, CHAR16 *name, CHAR8 **buffer, UINTN *size) { - CHAR8 *buf; - UINTN l; - EFI_STATUS err; - - l = sizeof(CHAR16 *) * EFI_MAXIMUM_VARIABLE_SIZE; - buf = AllocatePool(l); - if (!buf) - return EFI_OUT_OF_RESOURCES; - - err = refit_call5_wrapper(RT->GetVariable, name, vendor, NULL, &l, buf); - if (EFI_ERROR(err) == EFI_SUCCESS) { - *buffer = buf; - if (size) - *size = l; - } else - MyFreePool(buf); - return err; -} // EFI_STATUS EfivarGetRaw() - -// From gummiboot: Set an EFI variable -static EFI_STATUS EfivarSetRaw(EFI_GUID *vendor, CHAR16 *name, CHAR8 *buf, UINTN size, BOOLEAN persistent) { - UINT32 flags; - - flags = EFI_VARIABLE_BOOTSERVICE_ACCESS|EFI_VARIABLE_RUNTIME_ACCESS; - if (persistent) - flags |= EFI_VARIABLE_NON_VOLATILE; - - return refit_call5_wrapper(RT->SetVariable, name, vendor, flags, size, buf); -} // EFI_STATUS EfivarSetRaw() - // From gummiboot: Reboot the computer into its built-in user interface static EFI_STATUS RebootIntoFirmware(VOID) { CHAR8 *b; @@ -440,18 +412,57 @@ static EFI_STATUS RebootIntoFirmware(VOID) { 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. +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(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"); + StoreLoaderName(SelectionName); StartEFIImage(Entry->DevicePath, Entry->LoadOptions, TYPE_EFI, - Basename(Entry->LoaderPath), Entry->OSType, &ErrorInStep, !Entry->UseGraphicsMode); + Basename(Entry->LoaderPath), Entry->OSType, &ErrorInStep, !Entry->UseGraphicsMode, FALSE); FinishExternalScreen(); } @@ -463,7 +474,7 @@ static VOID StartLoader(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) { @@ -792,7 +803,6 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { SubEntry = InitializeLoaderEntry(Entry); if (SubEntry != NULL) { SubEntry->me.Title = L"Boot Linux for a 17\" iMac or a 15\" MacBook Pro (*)"; - SubEntry->UseGraphicsMode = TRUE; SubEntry->LoadOptions = L"-d 0 i17"; SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_ELILO; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); @@ -801,7 +811,6 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { SubEntry = InitializeLoaderEntry(Entry); if (SubEntry != NULL) { SubEntry->me.Title = L"Boot Linux for a 20\" iMac (*)"; - SubEntry->UseGraphicsMode = TRUE; SubEntry->LoadOptions = L"-d 0 i20"; SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_ELILO; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); @@ -810,7 +819,6 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { SubEntry = InitializeLoaderEntry(Entry); if (SubEntry != NULL) { SubEntry->me.Title = L"Boot Linux for a Mac Mini (*)"; - SubEntry->UseGraphicsMode = TRUE; SubEntry->LoadOptions = L"-d 0 mini"; SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_ELILO; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); @@ -842,7 +850,6 @@ VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) { SubEntry = InitializeLoaderEntry(Entry); if (SubEntry != NULL) { SubEntry->me.Title = L"Run XOM in text mode"; - SubEntry->UseGraphicsMode = FALSE; SubEntry->LoadOptions = L"-v"; SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS; AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); @@ -899,61 +906,67 @@ static VOID GuessLinuxDistribution(CHAR16 **OSIconName, REFIT_VOLUME *Volume, CH // 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, *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); - // 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); - } + 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); + } - // 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]; - } + // 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]; + } - // 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", FileName) || StriSubCmp(L"vmlinuz", FileName)) { - GuessLinuxDistribution(&OSIconName, Volume, 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','); @@ -968,33 +981,38 @@ VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, REFIT_VOLUME *Vo 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 || - StriCmp(FileName, L"bkpbootmgfw.efi") == 0) { - MergeStrings(&OSIconName, L"win", L','); + } 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"win8", L','); Entry->OSType = 'W'; ShortcutLetter = 'W'; Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS; - } else if (StriCmp(FileName, L"xom.efi") == 0) { - MergeStrings(&OSIconName, L"xom,win", L','); - Entry->UseGraphicsMode = TRUE; + } else if (StriCmp(NameClues, L"xom.efi") == 0) { + MergeStrings(&OSIconName, L"xom,win,win8", L','); 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 @@ -1007,14 +1025,20 @@ VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, REFIT_VOLUME *Vo // 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) { - LOADER_ENTRY *Entry; + LOADER_ENTRY *Entry; CleanUpPathNameSlashes(LoaderPath); Entry = InitializeLoaderEntry(NULL); 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'\\')) { @@ -1246,9 +1270,12 @@ static BOOLEAN HasSignedCounterpart(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN MergeStrings(&NewFile, Path, 0); MergeStrings(&NewFile, Filename, L'\\'); MergeStrings(&NewFile, L".efi.signed", 0); - if (FileExists(Volume->RootDir, NewFile)) - retval = TRUE; - MyFreePool(NewFile); + if (NewFile != NULL) { + CleanUpPathNameSlashes(NewFile); + if (FileExists(Volume->RootDir, NewFile)) + retval = TRUE; + MyFreePool(NewFile); + } // if return retval; } // BOOLEAN HasSignedCounterpart() @@ -1268,8 +1295,7 @@ static BOOLEAN ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 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)) { @@ -1328,6 +1354,53 @@ static BOOLEAN ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 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 = NULL; + UINTN boot_info_size = 0; + + FilePath = FileDevicePath (Volume, IPXE_DISCOVER_NAME); + Status = refit_call6_wrapper(BS->LoadImage, FALSE, SelfImageHandle, FilePath, + NULL, 0, &iPXEHandle); + if (Status != 0) + return NULL; + + 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; @@ -1343,9 +1416,9 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { MergeStrings(&MatchPatterns, LINUX_MATCH_PATTERNS, L','); // check for Mac OS X boot loader - if (ShouldScan(Volume, L"System\\Library\\CoreServices")) { + if (ShouldScan(Volume, MACOSX_LOADER_DIR)) { StrCpy(FileName, MACOSX_LOADER_PATH); - if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, Directory, L"boot.efi", GlobalConfig.DontScanFiles)) { + if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, MACOSX_LOADER_DIR, L"boot.efi", GlobalConfig.DontScanFiles)) { AddLoaderEntry(FileName, L"Mac OS X", Volume); if (DuplicatesFallback(Volume, FileName)) ScanFallbackLoader = FALSE; @@ -1353,7 +1426,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { // check for XOM StrCpy(FileName, L"System\\Library\\CoreServices\\xom.efi"); - if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, Directory, L"boot.efi", GlobalConfig.DontScanFiles)) { + if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, MACOSX_LOADER_DIR, L"xom.efi", GlobalConfig.DontScanFiles)) { AddLoaderEntry(FileName, L"Windows XP (XoM)", Volume); if (DuplicatesFallback(Volume, FileName)) ScanFallbackLoader = FALSE; @@ -1363,7 +1436,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { // check for Microsoft boot loader/menu 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", + if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, L"EFI\\Microsoft\\Boot", L"bkpbootmgfw.efi", GlobalConfig.DontScanFiles)) { AddLoaderEntry(FileName, L"Microsoft EFI boot (Boot Repair backup)", Volume); FoundBRBackup = TRUE; @@ -1371,7 +1444,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { ScanFallbackLoader = FALSE; } StrCpy(FileName, L"EFI\\Microsoft\\Boot\\bootmgfw.efi"); - if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, Directory, L"bootmgfw.efi", GlobalConfig.DontScanFiles)) { + if (FileExists(Volume->RootDir, FileName) && !FilenameIn(Volume, L"EFI\\Microsoft\\Boot", L"bootmgfw.efi", GlobalConfig.DontScanFiles)) { if (FoundBRBackup) AddLoaderEntry(FileName, L"Supposed Microsoft EFI boot (probably GRUB)", Volume); else @@ -1395,7 +1468,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { ScanFallbackLoader = FALSE; } // while() Status = DirIterClose(&EfiDirIter); - if (Status != EFI_NOT_FOUND) + if ((Status != EFI_NOT_FOUND) && (Status != EFI_INVALID_PARAMETER)) CheckError(Status, L"while scanning the EFI directory"); // Scan user-specified (or additional default) directories.... @@ -1458,286 +1531,8 @@ static VOID ScanOptical(VOID) { } // for } // static VOID ScanOptical() -// -// legacy boot functions -// - -static EFI_STATUS ActivateMbrPartition(IN EFI_BLOCK_IO *BlockIO, IN UINTN PartitionIndex) -{ - EFI_STATUS Status; - UINT8 SectorBuffer[512]; - MBR_PARTITION_INFO *MbrTable, *EMbrTable; - UINT32 ExtBase, ExtCurrent, NextExtCurrent; - UINTN LogicalPartitionIndex = 4; - UINTN i; - BOOLEAN HaveBootCode; - - // read MBR - Status = refit_call5_wrapper(BlockIO->ReadBlocks, BlockIO, BlockIO->Media->MediaId, 0, 512, SectorBuffer); - if (EFI_ERROR(Status)) - return Status; - if (*((UINT16 *)(SectorBuffer + 510)) != 0xaa55) - return EFI_NOT_FOUND; // safety measure #1 - - // add boot code if necessary - HaveBootCode = FALSE; - for (i = 0; i < MBR_BOOTCODE_SIZE; i++) { - if (SectorBuffer[i] != 0) { - HaveBootCode = TRUE; - break; - } - } - if (!HaveBootCode) { - // no boot code found in the MBR, add the syslinux MBR code - SetMem(SectorBuffer, MBR_BOOTCODE_SIZE, 0); - CopyMem(SectorBuffer, syslinux_mbr, SYSLINUX_MBR_SIZE); - } - - // set the partition active - MbrTable = (MBR_PARTITION_INFO *)(SectorBuffer + 446); - ExtBase = 0; - for (i = 0; i < 4; i++) { - if (MbrTable[i].Flags != 0x00 && MbrTable[i].Flags != 0x80) - return EFI_NOT_FOUND; // safety measure #2 - if (i == PartitionIndex) - MbrTable[i].Flags = 0x80; - else if (PartitionIndex >= 4 && IS_EXTENDED_PART_TYPE(MbrTable[i].Type)) { - MbrTable[i].Flags = 0x80; - ExtBase = MbrTable[i].StartLBA; - } else - MbrTable[i].Flags = 0x00; - } - - // write MBR - Status = refit_call5_wrapper(BlockIO->WriteBlocks, BlockIO, BlockIO->Media->MediaId, 0, 512, SectorBuffer); - if (EFI_ERROR(Status)) - return Status; - - if (PartitionIndex >= 4) { - // we have to activate a logical partition, so walk the EMBR chain - - // NOTE: ExtBase was set above while looking at the MBR table - for (ExtCurrent = ExtBase; ExtCurrent; ExtCurrent = NextExtCurrent) { - // read current EMBR - Status = refit_call5_wrapper(BlockIO->ReadBlocks, BlockIO, BlockIO->Media->MediaId, ExtCurrent, 512, SectorBuffer); - if (EFI_ERROR(Status)) - return Status; - if (*((UINT16 *)(SectorBuffer + 510)) != 0xaa55) - return EFI_NOT_FOUND; // safety measure #3 - - // scan EMBR, set appropriate partition active - EMbrTable = (MBR_PARTITION_INFO *)(SectorBuffer + 446); - NextExtCurrent = 0; - for (i = 0; i < 4; i++) { - if (EMbrTable[i].Flags != 0x00 && EMbrTable[i].Flags != 0x80) - return EFI_NOT_FOUND; // safety measure #4 - if (EMbrTable[i].StartLBA == 0 || EMbrTable[i].Size == 0) - break; - if (IS_EXTENDED_PART_TYPE(EMbrTable[i].Type)) { - // link to next EMBR - NextExtCurrent = ExtBase + EMbrTable[i].StartLBA; - EMbrTable[i].Flags = (PartitionIndex >= LogicalPartitionIndex) ? 0x80 : 0x00; - break; - } else { - // logical partition - EMbrTable[i].Flags = (PartitionIndex == LogicalPartitionIndex) ? 0x80 : 0x00; - LogicalPartitionIndex++; - } - } - - // write current EMBR - Status = refit_call5_wrapper(BlockIO->WriteBlocks, BlockIO, BlockIO->Media->MediaId, ExtCurrent, 512, SectorBuffer); - if (EFI_ERROR(Status)) - return Status; - - if (PartitionIndex < LogicalPartitionIndex) - break; // stop the loop, no need to touch further EMBRs - } - - } - - return EFI_SUCCESS; -} /* static EFI_STATUS ActivateMbrPartition() */ - -// early 2006 Core Duo / Core Solo models -static UINT8 LegacyLoaderDevicePath1Data[] = { - 0x01, 0x03, 0x18, 0x00, 0x0B, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xE0, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xF9, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0x04, 0x06, 0x14, 0x00, 0xEB, 0x85, 0x05, 0x2B, - 0xB8, 0xD8, 0xA9, 0x49, 0x8B, 0x8C, 0xE2, 0x1B, - 0x01, 0xAE, 0xF2, 0xB7, 0x7F, 0xFF, 0x04, 0x00, -}; -// mid-2006 Mac Pro (and probably other Core 2 models) -static UINT8 LegacyLoaderDevicePath2Data[] = { - 0x01, 0x03, 0x18, 0x00, 0x0B, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xE0, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0x04, 0x06, 0x14, 0x00, 0xEB, 0x85, 0x05, 0x2B, - 0xB8, 0xD8, 0xA9, 0x49, 0x8B, 0x8C, 0xE2, 0x1B, - 0x01, 0xAE, 0xF2, 0xB7, 0x7F, 0xFF, 0x04, 0x00, -}; -// mid-2007 MBP ("Santa Rosa" based models) -static UINT8 LegacyLoaderDevicePath3Data[] = { - 0x01, 0x03, 0x18, 0x00, 0x0B, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xE0, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xF8, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0x04, 0x06, 0x14, 0x00, 0xEB, 0x85, 0x05, 0x2B, - 0xB8, 0xD8, 0xA9, 0x49, 0x8B, 0x8C, 0xE2, 0x1B, - 0x01, 0xAE, 0xF2, 0xB7, 0x7F, 0xFF, 0x04, 0x00, -}; -// early-2008 MBA -static UINT8 LegacyLoaderDevicePath4Data[] = { - 0x01, 0x03, 0x18, 0x00, 0x0B, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xC0, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xF8, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0x04, 0x06, 0x14, 0x00, 0xEB, 0x85, 0x05, 0x2B, - 0xB8, 0xD8, 0xA9, 0x49, 0x8B, 0x8C, 0xE2, 0x1B, - 0x01, 0xAE, 0xF2, 0xB7, 0x7F, 0xFF, 0x04, 0x00, -}; -// late-2008 MB/MBP (NVidia chipset) -static UINT8 LegacyLoaderDevicePath5Data[] = { - 0x01, 0x03, 0x18, 0x00, 0x0B, 0x00, 0x00, 0x00, - 0x00, 0x40, 0xCB, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xBF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0x04, 0x06, 0x14, 0x00, 0xEB, 0x85, 0x05, 0x2B, - 0xB8, 0xD8, 0xA9, 0x49, 0x8B, 0x8C, 0xE2, 0x1B, - 0x01, 0xAE, 0xF2, 0xB7, 0x7F, 0xFF, 0x04, 0x00, -}; - -static EFI_DEVICE_PATH *LegacyLoaderList[] = { - (EFI_DEVICE_PATH *)LegacyLoaderDevicePath1Data, - (EFI_DEVICE_PATH *)LegacyLoaderDevicePath2Data, - (EFI_DEVICE_PATH *)LegacyLoaderDevicePath3Data, - (EFI_DEVICE_PATH *)LegacyLoaderDevicePath4Data, - (EFI_DEVICE_PATH *)LegacyLoaderDevicePath5Data, - NULL -}; - -#define MAX_DISCOVERED_PATHS (16) - -static VOID StartLegacy(IN LEGACY_ENTRY *Entry) -{ - EFI_STATUS Status; - EG_IMAGE *BootLogoImage; - UINTN ErrorInStep = 0; - EFI_DEVICE_PATH *DiscoveredPathList[MAX_DISCOVERED_PATHS]; - - BeginExternalScreen(TRUE, L"Booting Legacy OS (Mac mode)"); - - BootLogoImage = LoadOSIcon(Entry->Volume->OSIconName, L"legacy", TRUE); - if (BootLogoImage != NULL) - BltImageAlpha(BootLogoImage, - (UGAWidth - BootLogoImage->Width ) >> 1, - (UGAHeight - BootLogoImage->Height) >> 1, - &StdBackgroundPixel); - - if (Entry->Volume->IsMbrPartition) { - ActivateMbrPartition(Entry->Volume->WholeDiskBlockIO, Entry->Volume->MbrPartitionIndex); - } - - ExtractLegacyLoaderPaths(DiscoveredPathList, MAX_DISCOVERED_PATHS, LegacyLoaderList); - - Status = StartEFIImageList(DiscoveredPathList, Entry->LoadOptions, TYPE_LEGACY, L"legacy loader", 0, &ErrorInStep, TRUE); - if (Status == EFI_NOT_FOUND) { - if (ErrorInStep == 1) { - Print(L"\nPlease make sure that you have the latest firmware update installed.\n"); - } else if (ErrorInStep == 3) { - Print(L"\nThe firmware refused to boot from the selected volume. Note that external\n" - L"hard drives are not well-supported by Apple's firmware for legacy OS booting.\n"); - } - } - FinishExternalScreen(); -} /* static VOID StartLegacy() */ - -// Start a device on a non-Mac using the EFI_LEGACY_BIOS_PROTOCOL -static VOID StartLegacyUEFI(LEGACY_ENTRY *Entry) -{ - BeginExternalScreen(TRUE, L"Booting Legacy OS (UEFI mode)"); - - BdsLibConnectDevicePath (Entry->BdsOption->DevicePath); - BdsLibDoLegacyBoot(Entry->BdsOption); - - // If we get here, it means that there was a failure.... - Print(L"Failure booting legacy (BIOS) OS."); - PauseForKey(); - FinishExternalScreen(); -} // static VOID StartLegacyUEFI() - -static LEGACY_ENTRY * AddLegacyEntry(IN CHAR16 *LoaderTitle, IN REFIT_VOLUME *Volume) -{ - LEGACY_ENTRY *Entry, *SubEntry; - REFIT_MENU_SCREEN *SubScreen; - CHAR16 *VolDesc, *LegacyTitle; - CHAR16 ShortcutLetter = 0; - - if (LoaderTitle == NULL) { - if (Volume->OSName != NULL) { - LoaderTitle = Volume->OSName; - if (LoaderTitle[0] == 'W' || LoaderTitle[0] == 'L') - ShortcutLetter = LoaderTitle[0]; - } else - LoaderTitle = L"Legacy OS"; - } - if (Volume->VolName != NULL) - VolDesc = Volume->VolName; - 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 = LegacyTitle; - Entry->me.Tag = TAG_LEGACY; - Entry->me.Row = 0; - Entry->me.ShortcutLetter = ShortcutLetter; - Entry->me.Image = LoadOSIcon(Volume->OSIconName, L"legacy", FALSE); - 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"); - Entry->Enabled = TRUE; - - // create the submenu - SubScreen = AllocateZeroPool(sizeof(REFIT_MENU_SCREEN)); - SubScreen->Title = AllocateZeroPool(256 * sizeof(CHAR16)); - SPrint(SubScreen->Title, 255, L"Boot Options for %s on %s", LoaderTitle, VolDesc); - SubScreen->TitleImage = Entry->me.Image; - SubScreen->Hint1 = StrDuplicate(SUBSCREEN_HINT1); - if (GlobalConfig.HideUIFlags & HIDEUI_FLAG_EDITOR) { - SubScreen->Hint2 = StrDuplicate(SUBSCREEN_HINT2_NO_EDITOR); - } else { - SubScreen->Hint2 = StrDuplicate(SUBSCREEN_HINT2); - } // if/else - - // default entry - SubEntry = AllocateZeroPool(sizeof(LEGACY_ENTRY)); - SubEntry->me.Title = AllocateZeroPool(256 * sizeof(CHAR16)); - SPrint(SubEntry->me.Title, 255, L"Boot %s", LoaderTitle); - SubEntry->me.Tag = TAG_LEGACY; - SubEntry->Volume = Entry->Volume; - SubEntry->LoadOptions = Entry->LoadOptions; - AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); - - AddMenuEntry(SubScreen, &MenuEntryReturn); - Entry->me.SubScreen = SubScreen; - AddMenuEntry(&MainMenu, (REFIT_MENU_ENTRY *)Entry); - return Entry; -} /* 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 * GetDiskBadge(IN UINTN DiskType) { EG_IMAGE * Badge = NULL; switch (DiskType) { @@ -1752,225 +1547,7 @@ static EG_IMAGE * GetDiskBadge(IN UINTN DiskType) { break; } // switch() return Badge; -} // static EG_IMAGE * GetDiskBadge() - -/** - Create a rEFInd boot option from a Legacy BIOS protocol option. -*/ -static LEGACY_ENTRY * AddLegacyEntryUEFI(BDS_COMMON_OPTION *BdsOption, IN UINT16 DiskType) -{ - LEGACY_ENTRY *Entry, *SubEntry; - REFIT_MENU_SCREEN *SubScreen; - CHAR16 ShortcutLetter = 0; - CHAR16 *LegacyDescription = BdsOption->Description; - - if (IsInSubstring(LegacyDescription, GlobalConfig.DontScanVolumes)) - return NULL; - - // prepare the menu entry - Entry = AllocateZeroPool(sizeof(LEGACY_ENTRY)); - Entry->me.Title = AllocateZeroPool(256 * sizeof(CHAR16)); - SPrint(Entry->me.Title, 255, L"Boot legacy target %s", LegacyDescription); - Entry->me.Tag = TAG_LEGACY_UEFI; - Entry->me.Row = 0; - Entry->me.ShortcutLetter = ShortcutLetter; - Entry->me.Image = LoadOSIcon(L"legacy", L"legacy", TRUE); - Entry->LoadOptions = (DiskType == BBS_CDROM) ? L"CD" : - ((DiskType == BBS_USB) ? L"USB" : L"HD"); - Entry->me.BadgeImage = GetDiskBadge(DiskType); - Entry->BdsOption = BdsOption; - Entry->Enabled = TRUE; - - // create the submenu - SubScreen = AllocateZeroPool(sizeof(REFIT_MENU_SCREEN)); - SubScreen->Title = AllocateZeroPool(256 * sizeof(CHAR16)); - SPrint(SubScreen->Title, 255, L"No boot options for legacy target"); - SubScreen->TitleImage = Entry->me.Image; - SubScreen->Hint1 = StrDuplicate(SUBSCREEN_HINT1); - if (GlobalConfig.HideUIFlags & HIDEUI_FLAG_EDITOR) { - SubScreen->Hint2 = StrDuplicate(SUBSCREEN_HINT2_NO_EDITOR); - } else { - SubScreen->Hint2 = StrDuplicate(SUBSCREEN_HINT2); - } // if/else - - // default entry - SubEntry = AllocateZeroPool(sizeof(LEGACY_ENTRY)); - SubEntry->me.Title = AllocateZeroPool(256 * sizeof(CHAR16)); - SPrint(SubEntry->me.Title, 255, L"Boot %s", LegacyDescription); - SubEntry->me.Tag = TAG_LEGACY_UEFI; - Entry->BdsOption = BdsOption; - AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry); - - AddMenuEntry(SubScreen, &MenuEntryReturn); - Entry->me.SubScreen = SubScreen; - AddMenuEntry(&MainMenu, (REFIT_MENU_ENTRY *)Entry); - return Entry; -} /* static LEGACY_ENTRY * AddLegacyEntryUEFI() */ - -/** - Scan for legacy BIOS targets on machines that implement EFI_LEGACY_BIOS_PROTOCOL. - In testing, protocol has not been implemented on Macs but has been - implemented on several Dell PCs and an ASUS motherboard. - Restricts output to disks of the specified DiskType. -*/ -static VOID ScanLegacyUEFI(IN UINTN DiskType) -{ - EFI_STATUS Status; - EFI_LEGACY_BIOS_PROTOCOL *LegacyBios; - UINT16 *BootOrder = NULL; - 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; - 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 = refit_call3_wrapper(gBS->LocateProtocol, &gEfiLegacyBootProtocolGuid, NULL, (VOID **) &LegacyBios); - if (EFI_ERROR (Status)) - 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); - if (BootOrder == NULL) { - BootOrderSize = 0; - } - - Index = 0; - while (Index < BootOrderSize / sizeof (UINT16)) - { - // Grab each boot option variable from the boot order, and convert - // the variable into a BDS boot option - UnicodeSPrint (BootOption, sizeof (BootOption), L"Boot%04x", BootOrder[Index]); - BdsOption = BdsLibVariableToOption (&TempList, BootOption); - - 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)) { - // 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; - BOOLEAN ShowVolume, HideIfOthersFound; - - ShowVolume = FALSE; - HideIfOthersFound = FALSE; - if (Volume->IsAppleLegacy) { - ShowVolume = TRUE; - HideIfOthersFound = TRUE; - } else if (Volume->HasBootCode) { - ShowVolume = TRUE; - if (Volume->BlockIO == Volume->WholeDiskBlockIO && - Volume->BlockIOOffset == 0 && - Volume->OSName == NULL) - // this is a whole disk (MBR) entry; hide if we have entries for partitions - HideIfOthersFound = TRUE; - } - if (HideIfOthersFound) { - // 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) - ShowVolume = FALSE; - } - } - - if (ShowVolume) - AddLegacyEntry(NULL, Volume); -} // static VOID ScanLegacyVolume() - -// Scan attached optical discs for legacy (BIOS) boot code -// and add anything found to the list.... -static VOID ScanLegacyDisc(VOID) -{ - UINTN VolumeIndex; - REFIT_VOLUME *Volume; - - if (GlobalConfig.LegacyType == LEGACY_TYPE_MAC) { - for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) { - Volume = Volumes[VolumeIndex]; - if (Volume->DiskKind == DISK_KIND_OPTICAL) - ScanLegacyVolume(Volume, VolumeIndex); - } // for - } else if (GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) { - ScanLegacyUEFI(BBS_CDROM); - } -} /* static VOID ScanLegacyDisc() */ - -// Scan internal hard disks for legacy (BIOS) boot code -// and add anything found to the list.... -static VOID ScanLegacyInternal(VOID) -{ - UINTN VolumeIndex; - REFIT_VOLUME *Volume; - - if (GlobalConfig.LegacyType == LEGACY_TYPE_MAC) { - for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) { - Volume = Volumes[VolumeIndex]; - if (Volume->DiskKind == DISK_KIND_INTERNAL) - 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() */ - -// Scan external disks for legacy (BIOS) boot code -// and add anything found to the list.... -static VOID ScanLegacyExternal(VOID) -{ - UINTN VolumeIndex; - REFIT_VOLUME *Volume; - - if (GlobalConfig.LegacyType == LEGACY_TYPE_MAC) { - for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) { - Volume = Volumes[VolumeIndex]; - if (Volume->DiskKind == DISK_KIND_EXTERNAL) - 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() */ +} // EG_IMAGE * GetDiskBadge() // // pre-boot tool functions @@ -1979,8 +1556,9 @@ static VOID ScanLegacyExternal(VOID) static VOID StartTool(IN LOADER_ENTRY *Entry) { BeginExternalScreen(Entry->UseGraphicsMode, Entry->me.Title + 6); // assumes "Start " as assigned below + StoreLoaderName(Entry->me.Title); StartEFIImage(Entry->DevicePath, Entry->LoadOptions, TYPE_EFI, - Basename(Entry->LoaderPath), Entry->OSType, NULL, TRUE); + Basename(Entry->LoaderPath), Entry->OSType, NULL, TRUE, FALSE); FinishExternalScreen(); } /* static VOID StartTool() */ @@ -2028,16 +1606,17 @@ static UINTN ScanDriverDir(IN CHAR16 *Path) SPrint(FileName, 255, L"%s\\%s", Path, DirEntry->FileName); NumFound++; Status = StartEFIImage(FileDevicePath(SelfLoadedImage->DeviceHandle, FileName), - L"", TYPE_EFI, DirEntry->FileName, 0, NULL, FALSE); + L"", TYPE_EFI, DirEntry->FileName, 0, NULL, FALSE, TRUE); } Status = DirIterClose(&DirIter); - if (Status != EFI_NOT_FOUND) { + if ((Status != EFI_NOT_FOUND) && (Status != EFI_INVALID_PARAMETER)) { SPrint(FileName, 255, L"while scanning the %s directory", Path); CheckError(Status, FileName); } return (NumFound); } +#ifdef __MAKEWITH_GNUEFI static EFI_STATUS ConnectAllDriversToAllControllers(VOID) { EFI_STATUS Status; @@ -2105,6 +1684,12 @@ Done: MyFreePool (AllHandleBuffer); return Status; } /* EFI_STATUS ConnectAllDriversToAllControllers() */ +#else +static EFI_STATUS ConnectAllDriversToAllControllers(VOID) { + BdsLibConnectAllDriversToAllControllers(); + return 0; +} +#endif // Load all EFI drivers from rEFInd's "drivers" subdirectory and from the // directories specified by the user in the "scan_driver_dirs" configuration @@ -2137,53 +1722,11 @@ static VOID LoadDrivers(VOID) } // while // connect all devices - if (NumFound > 0) + if (NumFound > 0) { ConnectAllDriversToAllControllers(); + } } /* static VOID LoadDrivers() */ -// Determine what (if any) type of legacy (BIOS) boot support is available -static VOID FindLegacyBootType(VOID) { - EFI_STATUS Status; - EFI_LEGACY_BIOS_PROTOCOL *LegacyBios; - - 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.... - Status = refit_call3_wrapper(gBS->LocateProtocol, &gEfiLegacyBootProtocolGuid, NULL, (VOID **) &LegacyBios); - if (!EFI_ERROR (Status)) - GlobalConfig.LegacyType = LEGACY_TYPE_UEFI; - - // Macs have their own system. If the firmware vendor code contains the - // string "Apple", assume it's available. Note that this overrides the - // UEFI type, and might yield false positives if the vendor string - // contains "Apple" as part of something bigger, so this isn't 100% - // perfect. - if (StriSubCmp(L"Apple", ST->FirmwareVendor)) - 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() { - 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') - 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 your computer lacks\n"); - Print(L"the necessary Compatibility Support Module (CSM) support.\n"); - PauseForKey(); - } // if (found) - } // if no legacy support -} // static VOID WarnIfLegacyProblems() - // Locates boot loaders. NOTE: This assumes that GlobalConfig.LegacyType is set correctly. static VOID ScanForBootloaders(VOID) { UINTN i; @@ -2197,8 +1740,8 @@ static VOID ScanForBootloaders(VOID) { ScanForLegacy = TRUE; } // for - // If UEFI & scanning for legacy loaders, update NVRAM boot manager list - if ((GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) && ScanForLegacy) { + // 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 @@ -2227,6 +1770,9 @@ static VOID ScanForBootloaders(VOID) { case 'o': case 'O': ScanOptical(); break; + case 'n': case 'N': + ScanNetboot(); + break; } // switch() } // for @@ -2250,7 +1796,8 @@ static VOID FindTool(CHAR16 *Locations, CHAR16 *Names, CHAR16 *Description, UINT 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))) { + if ((Volumes[VolumeIndex]->RootDir != NULL) && (FileExists(Volumes[VolumeIndex]->RootDir, PathName)) && + IsValidLoader(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 @@ -2316,7 +1863,7 @@ static VOID ScanForTools(VOID) { case TAG_SHELL: j = 0; while ((FileName = FindCommaDelimited(SHELL_NAMES, j++)) != NULL) { - if (FileExists(SelfRootDir, FileName)) { + if (FileExists(SelfRootDir, FileName) && IsValidLoader(SelfRootDir, FileName)) { AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"EFI Shell", BuiltinIcon(BUILTIN_ICON_TOOL_SHELL), 'S', FALSE); } @@ -2327,7 +1874,7 @@ static VOID ScanForTools(VOID) { case TAG_GPTSYNC: j = 0; while ((FileName = FindCommaDelimited(GPTSYNC_NAMES, j++)) != NULL) { - if (FileExists(SelfRootDir, FileName)) { + if (FileExists(SelfRootDir, FileName) && IsValidLoader(SelfRootDir, FileName)) { AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"Hybrid MBR tool", BuiltinIcon(BUILTIN_ICON_TOOL_PART), 'P', FALSE); } // if @@ -2339,7 +1886,7 @@ static VOID ScanForTools(VOID) { case TAG_GDISK: j = 0; while ((FileName = FindCommaDelimited(GDISK_NAMES, j++)) != NULL) { - if (FileExists(SelfRootDir, FileName)) { + if (FileExists(SelfRootDir, FileName) && IsValidLoader(SelfRootDir, FileName)) { AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"disk partitioning tool", BuiltinIcon(BUILTIN_ICON_TOOL_PART), 'G', FALSE); } // if @@ -2347,11 +1894,24 @@ static VOID ScanForTools(VOID) { } // while FileName = NULL; break; + + case TAG_NETBOOT: + j = 0; + while ((FileName = FindCommaDelimited(NETBOOT_NAMES, j++)) != NULL) { + if (FileExists(SelfRootDir, FileName) && IsValidLoader(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: FileName = StrDuplicate(L"\\com.apple.recovery.boot\\boot.efi"); for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) { - if ((Volumes[VolumeIndex]->RootDir != NULL) && (FileExists(Volumes[VolumeIndex]->RootDir, FileName))) { + if ((Volumes[VolumeIndex]->RootDir != NULL) && (FileExists(Volumes[VolumeIndex]->RootDir, FileName)) && + IsValidLoader(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); @@ -2367,6 +1927,7 @@ static VOID ScanForTools(VOID) { SplitVolumeAndFilename(&FileName, &VolName); for (VolumeIndex = 0; VolumeIndex < VolumesCount; VolumeIndex++) { if ((Volumes[VolumeIndex]->RootDir != NULL) && (FileExists(Volumes[VolumeIndex]->RootDir, FileName)) && + IsValidLoader(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, @@ -2393,14 +1954,15 @@ static VOID ScanForTools(VOID) { } // 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; @@ -2506,7 +2068,7 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) BOOLEAN MokProtocol; REFIT_MENU_ENTRY *ChosenEntry; UINTN MenuExit, i; - CHAR16 *Selection = NULL; + CHAR16 *SelectionName = NULL; EG_PIXEL BGColor; // bootstrap @@ -2522,7 +2084,6 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) CopyMem(GlobalConfig.ScanFor, "ihebocm ", NUM_SCAN_OPTIONS); SetConfigFilename(ImageHandle); ReadConfig(GlobalConfig.ConfigFilename); -// ScanVolumes(); InitScreen(); WarnIfLegacyProblems(); @@ -2544,22 +2105,23 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) 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 if (GlobalConfig.DefaultSelection) - Selection = StrDuplicate(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) { MenuExit = 0; - RescanAll(); + RescanAll(TRUE); continue; } @@ -2582,15 +2144,15 @@ 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; case TAG_LEGACY_UEFI: // Boot a legacy OS on a non-Mac - StartLegacyUEFI((LEGACY_ENTRY *)ChosenEntry); + StartLegacyUEFI((LEGACY_ENTRY *)ChosenEntry, SelectionName); break; case TAG_TOOL: // Start a EFI tool @@ -2611,8 +2173,6 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) 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