*/
/*
* Modifications copyright (c) 2012 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
* with this source code or binaries made from it.
- *
+ *
*/
#include "global.h"
#include "lib.h"
#include "icns.h"
#include "menu.h"
+#include "mok.h"
#include "../include/Handle.h"
#include "../include/refit_call_wrapper.h"
#include "driver_support.h"
#define MACOSX_LOADER_PATH L"System\\Library\\CoreServices\\boot.efi"
#if defined (EFIX64)
-#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shellx64.efi"
+#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\EFI\\tools\\shellx64.efi,\\shellx64.efi"
#define DRIVER_DIRS L"drivers,drivers_x64"
#elif defined (EFI32)
-#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shellia32.efi"
+#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\EFI\\tools\shellia32.efi,\\shellia32.efi"
#define DRIVER_DIRS L"drivers,drivers_ia32"
#else
#define SHELL_NAMES L"\\EFI\\tools\\shell.efi"
#define DRIVER_DIRS L"drivers"
#endif
+#define MOK_NAMES L"\\EFI\\tools\\MokManager.efi,\\EFI\\redhat\\MokManager.efi,\\EFI\\ubuntu\\MokManager.efi,\\EFI\\suse\\MokManager"
+
// 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
// a ".efi" extension to be found when scanning for boot loaders.
#define LINUX_MATCH_PATTERNS L"vmlinuz*,bzImage*"
+// Default hint text
+#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"
+
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 MenuEntryExit = { L"Exit rEFInd", TAG_EXIT, 1, 0, 0, NULL, NULL, NULL };
-static REFIT_MENU_SCREEN MainMenu = { L"Main Menu", NULL, 0, NULL, 0, NULL, 0, L"Automatic boot" };
-static REFIT_MENU_SCREEN AboutMenu = { L"About", NULL, 0, NULL, 0, NULL, 0, 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, 20, 0, 0, GRAPHICS_FOR_OSX, LEGACY_TYPE_MAC, 0,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- {TAG_SHELL, TAG_ABOUT, TAG_SHUTDOWN, TAG_REBOOT, 0, 0, 0, 0, 0 }};
+REFIT_CONFIG GlobalConfig = { FALSE, FALSE, 0, 0, 0, 20, 0, 0, GRAPHICS_FOR_OSX, LEGACY_TYPE_MAC, 0,
+ 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 }};
// Structure used to hold boot loader filenames and time stamps in
// a linked list; used to sort entries within a directory.
if (AboutMenu.EntryCount == 0) {
AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
- AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.4.5.5");
+ AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.6.0.2");
AddMenuInfoLine(&AboutMenu, L"");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith");
#if defined(EFI32)
AddMenuInfoLine(&AboutMenu, L" Platform: x86 (32 bit)");
#elif defined(EFIX64)
- AddMenuInfoLine(&AboutMenu, L" Platform: x86_64 (64 bit)");
+ 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);
#else
AddMenuInfoLine(&AboutMenu, L" Platform: unknown");
#endif
RunMenu(&AboutMenu, NULL);
} /* VOID AboutrEFInd() */
+// Launch an EFI binary.
static EFI_STATUS StartEFIImageList(IN EFI_DEVICE_PATH **DevicePaths,
IN CHAR16 *LoadOptions, IN CHAR16 *LoadOptionsPrefix,
- IN CHAR16 *ImageTitle,
+ IN CHAR16 *ImageTitle, IN CHAR8 OSType,
OUT UINTN *ErrorInStep,
IN BOOLEAN Verbose)
{
EFI_STATUS Status, ReturnStatus;
EFI_HANDLE ChildImageHandle;
- EFI_LOADED_IMAGE *ChildLoadedImage;
+ EFI_LOADED_IMAGE *ChildLoadedImage = NULL;
+ REFIT_FILE File;
+ VOID *ImageData = NULL;
+ UINTN ImageSize;
+ REFIT_VOLUME *DeviceVolume = NULL;
UINTN DevicePathIndex;
CHAR16 ErrorInfo[256];
CHAR16 *FullLoadOptions = NULL;
+ CHAR16 *loader = NULL;
+ BOOLEAN UseMok = FALSE;
- if (Verbose)
- Print(L"Starting %s\n", ImageTitle);
if (ErrorInStep != NULL)
*ErrorInStep = 0;
- // load the image into memory
- ReturnStatus = Status = EFI_NOT_FOUND; // in case the list is empty
- for (DevicePathIndex = 0; DevicePaths[DevicePathIndex] != NULL; DevicePathIndex++) {
- ReturnStatus = Status = refit_call6_wrapper(BS->LoadImage, FALSE, SelfImageHandle, DevicePaths[DevicePathIndex], NULL, 0, &ChildImageHandle);
- if (ReturnStatus != EFI_NOT_FOUND) {
- break;
- }
- }
- SPrint(ErrorInfo, 255, L"while loading %s", ImageTitle);
- if (CheckError(Status, ErrorInfo)) {
- if (ErrorInStep != NULL)
- *ErrorInStep = 1;
- goto bailout;
- }
-
// set load options
if (LoadOptions != NULL) {
- ReturnStatus = Status = refit_call3_wrapper(BS->HandleProtocol, ChildImageHandle, &LoadedImageProtocol, (VOID **) &ChildLoadedImage);
- if (CheckError(Status, L"while getting a LoadedImageProtocol handle")) {
- if (ErrorInStep != NULL)
- *ErrorInStep = 2;
- goto bailout_unload;
- }
-
if (LoadOptionsPrefix != NULL) {
- MergeStrings(&FullLoadOptions, LoadOptionsPrefix, 0);
+// MergeStrings(&FullLoadOptions, LoadOptionsPrefix, 0);
MergeStrings(&FullLoadOptions, LoadOptions, L' ');
- 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 (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
- // NOTE: We also include the terminating null in the length for safety.
- ChildLoadedImage->LoadOptions = (VOID *)FullLoadOptions;
- ChildLoadedImage->LoadOptionsSize = ((UINT32)StrLen(FullLoadOptions) + 1) * sizeof(CHAR16);
- if (Verbose)
- Print(L"Using load options '%s'\n", FullLoadOptions);
+ } 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" ");
}
+ if (Verbose)
+ Print(L"Starting %s\nUsing load options '%s'\n", ImageTitle, FullLoadOptions);
- // close open file handles
- UninitRefitLib();
-
- // turn control over to the image
- // TODO: (optionally) re-enable the EFI watchdog timer!
- ReturnStatus = Status = refit_call3_wrapper(BS->StartImage, ChildImageHandle, NULL, NULL);
- // control returns here when the child image calls Exit()
- SPrint(ErrorInfo, 255, L"returned from %s", ImageTitle);
+ // 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 the ReadFile() and
+ // FindVolumeAndFilename() calls were moved earlier, 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);
+ if ((Status == EFI_ACCESS_DENIED) && (ShimLoaded())) {
+ FindVolumeAndFilename(DevicePaths[DevicePathIndex], &DeviceVolume, &loader);
+ if (DeviceVolume != NULL) {
+ Status = ReadFile(DeviceVolume->RootDir, loader, &File, &ImageSize);
+ ImageData = File.Buffer;
+ } else {
+ Status = EFI_NOT_FOUND;
+ Print(L"Error: device volume not found!\n");
+ } // if/else
+ if (Status != EFI_NOT_FOUND) {
+ ReturnStatus = Status = start_image(SelfImageHandle, loader, ImageData, ImageSize, FullLoadOptions,
+ DeviceVolume, FileDevicePath(DeviceVolume->DeviceHandle, loader));
+// ReturnStatus = Status = start_image(SelfImageHandle, loader, ImageData, ImageSize, FullLoadOptions,
+// DeviceVolume, DevicePaths[DevicePathIndex]);
+ }
+ if (ReturnStatus == EFI_SUCCESS) {
+ UseMok = TRUE;
+ } // if
+ } // if (UEFI SB failed; use shim)
+ if (ReturnStatus != EFI_NOT_FOUND) {
+ break;
+ }
+ }
+ SPrint(ErrorInfo, 255, L"while loading %s", ImageTitle);
if (CheckError(Status, ErrorInfo)) {
if (ErrorInStep != NULL)
- *ErrorInStep = 3;
+ *ErrorInStep = 1;
+ goto bailout;
}
- // re-open file handles
- ReinitRefitLib();
+ if (!UseMok) {
+ ReturnStatus = Status = refit_call3_wrapper(BS->HandleProtocol, ChildImageHandle, &LoadedImageProtocol,
+ (VOID **) &ChildLoadedImage);
+ if (CheckError(Status, L"while getting a LoadedImageProtocol handle")) {
+ if (ErrorInStep != NULL)
+ *ErrorInStep = 2;
+ goto bailout_unload;
+ }
+ ChildLoadedImage->LoadOptions = (VOID *)FullLoadOptions;
+ ChildLoadedImage->LoadOptionsSize = ((UINT32)StrLen(FullLoadOptions) + 1) * sizeof(CHAR16);
+ // turn control over to the image
+ // TODO: (optionally) re-enable the EFI watchdog timer!
+
+ // close open file handles
+ UninitRefitLib();
+ ReturnStatus = Status = refit_call3_wrapper(BS->StartImage, ChildImageHandle, NULL, NULL);
+ // control returns here when the child image calls Exit()
+ SPrint(ErrorInfo, 255, L"returned from %s", ImageTitle);
+ if (CheckError(Status, ErrorInfo)) {
+ if (ErrorInStep != NULL)
+ *ErrorInStep = 3;
+ }
+
+ // re-open file handles
+ ReinitRefitLib();
+ } // if
bailout_unload:
// unload the image, we don't care if it works or not...
- Status = refit_call1_wrapper(BS->UnloadImage, ChildImageHandle);
+ if (!UseMok)
+ Status = refit_call1_wrapper(BS->UnloadImage, ChildImageHandle);
+
bailout:
- if (FullLoadOptions != NULL)
- FreePool(FullLoadOptions);
+ MyFreePool(FullLoadOptions);
return ReturnStatus;
} /* static EFI_STATUS StartEFIImageList() */
static EFI_STATUS StartEFIImage(IN EFI_DEVICE_PATH *DevicePath,
IN CHAR16 *LoadOptions, IN CHAR16 *LoadOptionsPrefix,
- IN CHAR16 *ImageTitle,
+ IN CHAR16 *ImageTitle, IN CHAR8 OSType,
OUT UINTN *ErrorInStep,
IN BOOLEAN Verbose)
{
DevicePaths[0] = DevicePath;
DevicePaths[1] = NULL;
- return StartEFIImageList(DevicePaths, LoadOptions, LoadOptionsPrefix, ImageTitle, ErrorInStep, Verbose);
+ return StartEFIImageList(DevicePaths, LoadOptions, LoadOptionsPrefix, ImageTitle, OSType, ErrorInStep, Verbose);
} /* static EFI_STATUS StartEFIImage() */
//
UINTN ErrorInStep = 0;
BeginExternalScreen(Entry->UseGraphicsMode, L"Booting OS");
- StartEFIImage(Entry->DevicePath, Entry->LoadOptions,
- Basename(Entry->LoaderPath), Basename(Entry->LoaderPath), &ErrorInStep, !Entry->UseGraphicsMode);
+ StartEFIImage(Entry->DevicePath, Entry->LoadOptions, Basename(Entry->LoaderPath),
+ Basename(Entry->LoaderPath), Entry->OSType, &ErrorInStep, !Entry->UseGraphicsMode);
FinishExternalScreen();
}
MergeStrings(&InitrdName, DirEntry->FileName, 0);
} // if
} // if/else
- if (InitrdVersion != NULL)
- FreePool(InitrdVersion);
+ MyFreePool(InitrdVersion);
} // while
DirIterClose(&DirIter);
// Note: Don't FreePool(FileName), since Basename returns a pointer WITHIN the string it's passed.
- FreePool(KernelVersion);
- FreePool(Path);
+ MyFreePool(KernelVersion);
+ MyFreePool(Path);
return (InitrdName);
} // static CHAR16 * FindInitrd()
NewEntry = AllocateZeroPool(sizeof(REFIT_MENU_SCREEN));
if ((Entry != NULL) && (NewEntry != NULL)) {
CopyMem(NewEntry, Entry, sizeof(REFIT_MENU_SCREEN));
- NewEntry->Title = StrDuplicate(Entry->Title);
- NewEntry->TimeoutText = StrDuplicate(Entry->TimeoutText);
+ NewEntry->Title = (Entry->Title) ? StrDuplicate(Entry->Title) : NULL;
+ NewEntry->TimeoutText = (Entry->TimeoutText) ? StrDuplicate(Entry->TimeoutText) : NULL;
if (Entry->TitleImage != NULL) {
NewEntry->TitleImage = AllocatePool(sizeof(EG_IMAGE));
if (NewEntry->TitleImage != NULL)
} // if
NewEntry->InfoLines = (CHAR16**) AllocateZeroPool(Entry->InfoLineCount * (sizeof(CHAR16*)));
for (i = 0; i < Entry->InfoLineCount && NewEntry->InfoLines; i++) {
- NewEntry->InfoLines[i] = StrDuplicate(Entry->InfoLines[i]);
+ NewEntry->InfoLines[i] = (Entry->InfoLines[i]) ? StrDuplicate(Entry->InfoLines[i]) : NULL;
} // for
NewEntry->Entries = (REFIT_MENU_ENTRY**) AllocateZeroPool(Entry->EntryCount * (sizeof (REFIT_MENU_ENTRY*)));
for (i = 0; i < Entry->EntryCount && NewEntry->Entries; i++) {
AddMenuEntry(NewEntry, Entry->Entries[i]);
} // for
+ NewEntry->Hint1 = (Entry->Hint1) ? StrDuplicate(Entry->Hint1) : NULL;
+ NewEntry->Hint2 = (Entry->Hint2) ? StrDuplicate(Entry->Hint2) : NULL;
} // if
return (NewEntry);
} // static REFIT_MENU_SCREEN* CopyMenuScreen()
NewEntry = AllocateZeroPool(sizeof(REFIT_MENU_ENTRY));
if ((Entry != NULL) && (NewEntry != NULL)) {
CopyMem(NewEntry, Entry, sizeof(REFIT_MENU_ENTRY));
- NewEntry->Title = StrDuplicate(Entry->Title);
+ NewEntry->Title = (Entry->Title) ? StrDuplicate(Entry->Title) : NULL;
if (Entry->BadgeImage != NULL) {
NewEntry->BadgeImage = AllocatePool(sizeof(EG_IMAGE));
if (NewEntry->BadgeImage != NULL)
NewEntry->UseGraphicsMode = FALSE;
NewEntry->OSType = 0;
if (Entry != NULL) {
- NewEntry->LoaderPath = StrDuplicate(Entry->LoaderPath);
- NewEntry->VolName = StrDuplicate(Entry->VolName);
+ NewEntry->LoaderPath = (Entry->LoaderPath) ? StrDuplicate(Entry->LoaderPath) : NULL;
+ NewEntry->VolName = (Entry->VolName) ? StrDuplicate(Entry->VolName) : NULL;
NewEntry->DevicePath = Entry->DevicePath;
NewEntry->UseGraphicsMode = Entry->UseGraphicsMode;
- NewEntry->LoadOptions = StrDuplicate(Entry->LoadOptions);
- NewEntry->InitrdPath = StrDuplicate(Entry->InitrdPath);
+ NewEntry->LoadOptions = (Entry->LoadOptions) ? StrDuplicate(Entry->LoadOptions) : NULL;
+ NewEntry->InitrdPath = (Entry->InitrdPath) ? StrDuplicate(Entry->InitrdPath) : NULL;
}
} // if
return (NewEntry);
} // LOADER_ENTRY *InitializeLoaderEntry()
+// Adds InitrdPath to Options, but only if Options doesn't already include an
+// initrd= line. Done to enable overriding the default initrd selection in a
+// refind_linux.conf file's options list.
+// Returns a pointer to a new string. The calling function is responsible for
+// freeing its memory.
+static CHAR16 *AddInitrdToOptions(CHAR16 *Options, CHAR16 *InitrdPath) {
+ CHAR16 *NewOptions = NULL;
+
+ if (Options != NULL)
+ NewOptions = StrDuplicate(Options);
+ if ((InitrdPath != NULL) && !StriSubCmp(L"initrd=", Options)) {
+ MergeStrings(&NewOptions, L"initrd=", L' ');
+ MergeStrings(&NewOptions, InitrdPath, 0);
+ }
+ return NewOptions;
+} // CHAR16 *AddInitrdToOptions()
+
// Prepare a REFIT_MENU_SCREEN data structure for a subscreen entry. This sets up
// the default entry that launches the boot loader using the same options as the
// main Entry does. Subsequent options can be added by the calling function.
// Returns a pointer to the new subscreen data structure, or NULL if there
// were problems allocating memory.
REFIT_MENU_SCREEN *InitializeSubScreen(IN LOADER_ENTRY *Entry) {
- CHAR16 *FileName, *Temp = NULL;
+ CHAR16 *FileName, *MainOptions = NULL;
REFIT_MENU_SCREEN *SubScreen = NULL;
LOADER_ENTRY *SubEntry;
// default entry
SubEntry = InitializeLoaderEntry(Entry);
if (SubEntry != NULL) {
- SubEntry->me.Title = L"Boot using default options";
- if ((SubEntry->InitrdPath != NULL) && (StrLen(SubEntry->InitrdPath) > 0) && (!StriSubCmp(L"initrd", SubEntry->LoadOptions))) {
- MergeStrings(&Temp, L"initrd=", 0);
- MergeStrings(&Temp, SubEntry->InitrdPath, 0);
- MergeStrings(&SubEntry->LoadOptions, Temp, L' ');
- FreePool(Temp);
- } // if
+ SubEntry->me.Title = StrDuplicate(L"Boot using default options");
+ MainOptions = SubEntry->LoadOptions;
+ SubEntry->LoadOptions = AddInitrdToOptions(MainOptions, SubEntry->InitrdPath);
+ MyFreePool(MainOptions);
AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry);
} // if (SubEntry != NULL)
+ 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
} // if (SubScreen != NULL)
} else { // existing subscreen; less initialization, and just add new entry later....
SubScreen = Entry->me.SubScreen;
VOID GenerateSubScreen(LOADER_ENTRY *Entry, IN REFIT_VOLUME *Volume) {
REFIT_MENU_SCREEN *SubScreen;
LOADER_ENTRY *SubEntry;
- CHAR16 *InitrdOption = NULL, *Temp;
+ CHAR16 *InitrdName;
CHAR16 DiagsFileName[256];
REFIT_FILE *File;
UINTN TokenCount;
// create the submenu
if (StrLen(Entry->Title) == 0) {
- FreePool(Entry->Title);
+ MyFreePool(Entry->Title);
Entry->Title = NULL;
}
SubScreen = InitializeSubScreen(Entry);
} // not single-user
// check for Apple hardware diagnostics
- StrCpy(DiagsFileName, L"\\System\\Library\\CoreServices\\.diagnostics\\diags.efi");
+ StrCpy(DiagsFileName, L"System\\Library\\CoreServices\\.diagnostics\\diags.efi");
if (FileExists(Volume->RootDir, DiagsFileName) && !(GlobalConfig.HideUIFlags & HIDEUI_FLAG_HWTEST)) {
SubEntry = InitializeLoaderEntry(Entry);
if (SubEntry != NULL) {
SubEntry->me.Title = L"Run Apple Hardware Test";
- FreePool(SubEntry->LoaderPath);
+ MyFreePool(SubEntry->LoaderPath);
SubEntry->LoaderPath = StrDuplicate(DiagsFileName);
SubEntry->DevicePath = FileDevicePath(Volume->DeviceHandle, SubEntry->LoaderPath);
SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_OSX;
} else if (Entry->OSType == 'L') { // entries for Linux kernels with EFI stub loaders
File = ReadLinuxOptionsFile(Entry->LoaderPath, Volume);
if (File != NULL) {
- if ((Temp = FindInitrd(Entry->LoaderPath, Volume)) != NULL) {
- MergeStrings(&InitrdOption, L"initrd=", 0);
- MergeStrings(&InitrdOption, Temp, 0);
- }
- TokenCount = ReadTokenLine(File, &TokenList); // read and discard first entry, since it's
- FreeTokenLine(&TokenList, &TokenCount); // set up by InitializeSubScreen(), earlier....
+ InitrdName = FindInitrd(Entry->LoaderPath, Volume);
+ TokenCount = ReadTokenLine(File, &TokenList);
+ // first entry requires special processing, since it was initially set
+ // up with a default title but correct options by InitializeSubScreen(),
+ // earlier....
+ if ((SubScreen->Entries != NULL) && (SubScreen->Entries[0] != NULL)) {
+ MyFreePool(SubScreen->Entries[0]->Title);
+ SubScreen->Entries[0]->Title = StrDuplicate(TokenList[0]);
+ } // if
+ FreeTokenLine(&TokenList, &TokenCount);
while ((TokenCount = ReadTokenLine(File, &TokenList)) > 1) {
SubEntry = InitializeLoaderEntry(Entry);
SubEntry->me.Title = StrDuplicate(TokenList[0]);
- if (SubEntry->LoadOptions != NULL)
- FreePool(SubEntry->LoadOptions);
- SubEntry->LoadOptions = StrDuplicate(TokenList[1]);
- MergeStrings(&SubEntry->LoadOptions, InitrdOption, L' ');
+ MyFreePool(SubEntry->LoadOptions);
+ SubEntry->LoadOptions = AddInitrdToOptions(TokenList[1], InitrdName);
FreeTokenLine(&TokenList, &TokenCount);
SubEntry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_LINUX;
AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry);
} // while
- if (InitrdOption)
- FreePool(InitrdOption);
- if (Temp)
- FreePool(Temp);
- FreePool(File);
+ MyFreePool(InitrdName);
+ MyFreePool(File);
} // if Linux options file exists
} else if (Entry->OSType == 'E') { // entries for ELILO
// kernel's directory; and if present, adds an initrd= option for an initial
// RAM disk file with the same version number as the kernel file.
static CHAR16 * GetMainLinuxOptions(IN CHAR16 * LoaderPath, IN REFIT_VOLUME *Volume) {
- CHAR16 *Options = NULL, *InitrdName, *InitrdOption = NULL;
+ CHAR16 *Options = NULL, *InitrdName, *FullOptions = NULL;
Options = GetFirstOptionsFromFile(LoaderPath, Volume);
InitrdName = FindInitrd(LoaderPath, Volume);
- if (InitrdName != NULL) {
- MergeStrings(&InitrdOption, L"initrd=", 0);
- MergeStrings(&InitrdOption, InitrdName, 0);
- } // if
- MergeStrings(&Options, InitrdOption, ' ');
- if (InitrdOption != NULL)
- FreePool(InitrdOption);
- if (InitrdName != NULL)
- FreePool(InitrdName);
- return (Options);
+ FullOptions = AddInitrdToOptions(Options, InitrdName);
+
+ MyFreePool(Options);
+ MyFreePool(InitrdName);
+ return (FullOptions);
} // static CHAR16 * GetMainLinuxOptions()
// Sets a few defaults for a loader entry -- mainly the icon, but also the OS type
Temp = FindLastDirName(LoaderPath);
MergeStrings(&OSIconName, Temp, L',');
- FreePool(Temp);
+ MyFreePool(Temp);
+ Temp = NULL;
if (OSIconName != NULL) {
ShortcutLetter = OSIconName[0];
}
Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_OSX;
} else if (StriCmp(FileName, L"diags.efi") == 0) {
MergeStrings(&OSIconName, L"hwtest", L',');
- } else if (StriCmp(FileName, L"e.efi") == 0 || StriCmp(FileName, L"elilo.efi") == 0) {
+ } else if (StriCmp(FileName, L"e.efi") == 0 || StriCmp(FileName, L"elilo.efi") == 0 || StriSubCmp(L"elilo", FileName)) {
MergeStrings(&OSIconName, L"elilo,linux", L',');
Entry->OSType = 'E';
if (ShortcutLetter == 0)
Entry->me.ShortcutLetter = ShortcutLetter;
if (Entry->me.Image == NULL)
Entry->me.Image = LoadOSIcon(OSIconName, L"unknown", FALSE);
- if (PathOnly != NULL)
- FreePool(PathOnly);
+ MyFreePool(PathOnly);
} // VOID SetLoaderDefaults()
// Add a specified EFI boot loader to the list, using automatic settings
INT64 Time1InSeconds, Time2InSeconds;
// Following values are overestimates; I'm assuming 31 days in every month.
- // This is fine for the purpose of this function, which has a limited
- // purpose.
+ // This is fine for the purpose of this function, which is limited
Time1InSeconds = Time1->Second + (Time1->Minute * 60) + (Time1->Hour * 3600) + (Time1->Day * 86400) +
(Time1->Month * 2678400) + ((Time1->Year - 1998) * 32140800);
Time2InSeconds = Time2->Second + (Time2->Minute * 60) + (Time2->Hour * 3600) + (Time2->Day * 86400) +
while (LoaderList != NULL) {
Temp = LoaderList;
LoaderList = LoaderList->NextEntry;
- FreePool(Temp->FileName);
- FreePool(Temp);
+ MyFreePool(Temp->FileName);
+ MyFreePool(Temp);
} // while
} // static VOID CleanUpLoaderList()
CHAR16 FileName[256], *Extension;
struct LOADER_LIST *LoaderList = NULL, *NewLoader;
- if ((!SelfDirPath || !Path || ((StriCmp(Path, SelfDirPath) == 0) && Volume->DeviceHandle != SelfVolume->DeviceHandle) ||
- (StriCmp(Path, SelfDirPath) != 0)) && (!IsIn(Path, GlobalConfig.DontScan))) {
+ if ((!SelfDirPath || !Path || ((StriCmp(Path, SelfDirPath) == 0) && (Volume->DeviceHandle != SelfVolume->DeviceHandle)) ||
+ (StriCmp(Path, SelfDirPath) != 0)) &&
+ (!IsIn(Path, GlobalConfig.DontScanDirs)) &&
+ (!IsIn(Volume->VolName, GlobalConfig.DontScanVolumes))) {
// look through contents of the directory
DirIterOpen(Volume->RootDir, Path, &DirIter);
while (DirIterNext(&DirIter, 2, Pattern, &DirEntry)) {
Extension = FindExtension(DirEntry->FileName);
if (DirEntry->FileName[0] == '.' ||
- StriCmp(DirEntry->FileName, L"TextMode.efi") == 0 ||
- StriCmp(DirEntry->FileName, L"ebounce.efi") == 0 ||
- StriCmp(DirEntry->FileName, L"GraphicsConsole.efi") == 0 ||
StriCmp(Extension, L".icns") == 0 ||
- StriSubCmp(L"shell", DirEntry->FileName))
+ StriSubCmp(L"shell", DirEntry->FileName) ||
+ IsIn(DirEntry->FileName, GlobalConfig.DontScanFiles))
continue; // skip this
if (Path)
- SPrint(FileName, 255, L"\\%s\\%s", Path, DirEntry->FileName);
+ SPrint(FileName, 255, L"\\%s\\%s", Path, DirEntry->FileName);
else
- SPrint(FileName, 255, L"\\%s", DirEntry->FileName);
+ SPrint(FileName, 255, L"\\%s", DirEntry->FileName);
CleanUpPathNameSlashes(FileName);
NewLoader = AllocateZeroPool(sizeof(struct LOADER_LIST));
if (NewLoader != NULL) {
NewLoader->TimeStamp = DirEntry->ModificationTime;
LoaderList = AddLoaderListEntry(LoaderList, NewLoader);
} // if
- FreePool(Extension);
+ MyFreePool(Extension);
} // while
NewLoader = LoaderList;
while (NewLoader != NULL) {
Status = DirIterClose(&DirIter);
if (Status != EFI_NOT_FOUND) {
if (Path)
- SPrint(FileName, 255, L"while scanning the %s directory", Path);
+ SPrint(FileName, 255, L"while scanning the %s directory", Path);
else
- StrCpy(FileName, L"while scanning the root directory");
+ StrCpy(FileName, L"while scanning the root directory");
CheckError(Status, FileName);
} // if (Status != EFI_NOT_FOUND)
} // if not scanning our own directory
CHAR16 FileName[256], *Directory, *MatchPatterns;
UINTN i, Length;
- MatchPatterns = StrDuplicate(LOADER_MATCH_PATTERNS);
- if (GlobalConfig.ScanAllLinux)
- MergeStrings(&MatchPatterns, LINUX_MATCH_PATTERNS, L',');
+ 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.DontScan)) {
+ if (!IsIn(L"System\\Library\\CoreServices", GlobalConfig.DontScanDirs)) {
StrCpy(FileName, MACOSX_LOADER_PATH);
- if (FileExists(Volume->RootDir, FileName)) {
+ if (FileExists(Volume->RootDir, FileName) && !IsIn(L"boot.efi", GlobalConfig.DontScanFiles)) {
AddLoaderEntry(FileName, L"Mac OS X", Volume);
}
// check for XOM
StrCpy(FileName, L"System\\Library\\CoreServices\\xom.efi");
- if (FileExists(Volume->RootDir, FileName)) {
+ if (FileExists(Volume->RootDir, FileName) && !IsIn(L"boot.efi", GlobalConfig.DontScanFiles)) {
AddLoaderEntry(FileName, L"Windows XP (XoM)", Volume);
}
- } // if Mac directory not in GlobalConfig.DontScan list
+ } // if Mac directory not in GlobalConfig.DontScanDirs list
// 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.DontScan)) {
+ 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);
}
Length = StrLen(Directory);
if (Length > 0)
ScanLoaderDir(Volume, Directory, MatchPatterns);
- FreePool(Directory);
+ MyFreePool(Directory);
} // while
} // if
} // static VOID ScanEfiFiles()
ExtractLegacyLoaderPaths(DiscoveredPathList, MAX_DISCOVERED_PATHS, LegacyLoaderList);
- Status = StartEFIImageList(DiscoveredPathList, Entry->LoadOptions, NULL, L"legacy loader", &ErrorInStep, TRUE);
+ Status = StartEFIImageList(DiscoveredPathList, Entry->LoadOptions, NULL, 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");
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));
#ifdef __MAKEWITH_TIANO
+// default volume badge icon based on disk kind
+static EG_IMAGE * GetDiskBadge(IN UINTN DiskType) {
+ EG_IMAGE * Badge = NULL;
+
+ switch (DiskType) {
+ case BBS_HARDDISK:
+ Badge = BuiltinIcon(BUILTIN_ICON_VOL_INTERNAL);
+ break;
+ case BBS_USB:
+ Badge = BuiltinIcon(BUILTIN_ICON_VOL_EXTERNAL);
+ break;
+ case BBS_CDROM:
+ Badge = BuiltinIcon(BUILTIN_ICON_VOL_OPTICAL);
+ break;
+ } // switch()
+ return Badge;
+} // static EG_IMAGE * GetDiskBadge()
+
/**
Create a rEFInd boot option from a Legacy BIOS protocol option.
*/
CHAR16 ShortcutLetter = 0;
CHAR16 *LegacyDescription = BdsOption->Description;
+// ScanVolume(Volume);
+
// 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_NON_MAC;
+ 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 = NULL;
+ Entry->me.BadgeImage = GetDiskBadge(DiskType);
+// Entry->me.BadgeImage = Volume->VolBadgeImage;
Entry->BdsOption = BdsOption;
Entry->Enabled = TRUE;
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_NON_MAC;
+ SubEntry->me.Tag = TAG_LEGACY_UEFI;
Entry->BdsOption = BdsOption;
AddMenuEntry(SubScreen, (REFIT_MENU_ENTRY *)SubEntry);
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 ScanLegacyNonMac(IN UINTN DiskType)
+static VOID ScanLegacyUEFI(IN UINTN DiskType)
{
EFI_STATUS Status;
EFI_LEGACY_BIOS_PROTOCOL *LegacyBios;
UINT16 *BootOrder = NULL;
UINTN Index = 0;
- UINT16 BootOption[10];
+ CHAR16 BootOption[10];
UINTN BootOrderSize = 0;
CHAR16 Buffer[20];
BDS_COMMON_OPTION *BdsOption;
LIST_ENTRY TempList;
BBS_BBS_DEVICE_PATH * BbsDevicePath = NULL;
+// REFIT_VOLUME Volume;
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 = gBS->LocateProtocol(&gEfiLegacyBootProtocolGuid, NULL, (VOID **) &LegacyBios);
if (EFI_ERROR (Status))
return;
// Grab the boot order
- BootOrder = BdsLibGetVariableAndSize (L"BootOrder", &gEfiGlobalVariableGuid, &BootOrderSize);
+ BootOrder = BdsLibGetVariableAndSize(L"BootOrder", &gEfiGlobalVariableGuid, &BootOrderSize);
if (BootOrder == NULL) {
BootOrderSize = 0;
}
UnicodeSPrint (BootOption, sizeof (BootOption), L"Boot%04x", BootOrder[Index]);
BdsOption = BdsLibVariableToOption (&TempList, BootOption);
- if(BdsOption != NULL) {
- //Print(L"Option description = '%s'\n", BdsOption->Description);
+ if (BdsOption != NULL) {
BbsDevicePath = (BBS_BBS_DEVICE_PATH *)BdsOption->DevicePath;
- // Only add the entry if it is of a supported type (e.g. USB, HD)
- // See BdsHelper.c for currently supported types
- if (BbsDevicePath->DeviceType == DiskType) {
-// if(IsBbsDeviceTypeSupported(BbsDevicePath->DeviceType)) {
+ // 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);
}
}
Index++;
}
-} /* static VOID ScanLegacyNonMac() */
+} /* static VOID ScanLegacyUEFI() */
#else
-static VOID ScanLegacyNonMac(IN UINTN DiskType){}
+static VOID ScanLegacyUEFI(IN UINTN DiskType){}
#endif // __MAKEWITH_TIANO
static VOID ScanLegacyVolume(REFIT_VOLUME *Volume, UINTN VolumeIndex) {
ScanLegacyVolume(Volume, VolumeIndex);
} // for
} else if (GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) {
- ScanLegacyNonMac(BBS_CDROM);
+ ScanLegacyUEFI(BBS_CDROM);
}
} /* static VOID ScanLegacyDisc() */
ScanLegacyVolume(Volume, VolumeIndex);
} // for
} else if (GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) {
- ScanLegacyNonMac(BBS_HARDDISK);
+ ScanLegacyUEFI(BBS_HARDDISK);
}
} /* static VOID ScanLegacyInternal() */
ScanLegacyVolume(Volume, VolumeIndex);
} // for
} else if (GlobalConfig.LegacyType == LEGACY_TYPE_UEFI) {
- ScanLegacyNonMac(BBS_USB);
+ ScanLegacyUEFI(BBS_USB);
}
} /* static VOID ScanLegacyExternal() */
{
BeginExternalScreen(Entry->UseGraphicsMode, Entry->me.Title + 6); // assumes "Start <title>" as assigned below
StartEFIImage(Entry->DevicePath, Entry->LoadOptions, Basename(Entry->LoaderPath),
- Basename(Entry->LoaderPath), NULL, TRUE);
+ Basename(Entry->LoaderPath), Entry->OSType, NULL, TRUE);
FinishExternalScreen();
} /* static VOID StartTool() */
-static LOADER_ENTRY * AddToolEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN EG_IMAGE *Image,
+static LOADER_ENTRY * AddToolEntry(EFI_HANDLE DeviceHandle, IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN EG_IMAGE *Image,
IN CHAR16 ShortcutLetter, IN BOOLEAN UseGraphicsMode)
{
LOADER_ENTRY *Entry;
Entry->me.Row = 1;
Entry->me.ShortcutLetter = ShortcutLetter;
Entry->me.Image = Image;
- Entry->LoaderPath = StrDuplicate(LoaderPath);
- Entry->DevicePath = FileDevicePath(SelfLoadedImage->DeviceHandle, Entry->LoaderPath);
+ Entry->LoaderPath = (LoaderPath) ? StrDuplicate(LoaderPath) : NULL;
+ Entry->DevicePath = FileDevicePath(DeviceHandle, Entry->LoaderPath);
Entry->UseGraphicsMode = UseGraphicsMode;
AddMenuEntry(&MainMenu, (REFIT_MENU_ENTRY *)Entry);
SPrint(FileName, 255, L"%s\\%s", Path, DirEntry->FileName);
NumFound++;
Status = StartEFIImage(FileDevicePath(SelfLoadedImage->DeviceHandle, FileName),
- L"", DirEntry->FileName, DirEntry->FileName, NULL, FALSE);
+ L"", DirEntry->FileName, DirEntry->FileName, 0, NULL, FALSE);
}
Status = DirIterClose(&DirIter);
if (Status != EFI_NOT_FOUND) {
}
}
- FreePool (HandleBuffer);
- FreePool (HandleType);
+ MyFreePool (HandleBuffer);
+ MyFreePool (HandleType);
}
Done:
- FreePool (AllHandleBuffer);
+ MyFreePool (AllHandleBuffer);
return Status;
} /* EFI_STATUS ConnectAllDriversToAllControllers() */
#else
// load drivers from the subdirectories of rEFInd's home directory specified
// in the DRIVER_DIRS constant.
while ((Directory = FindCommaDelimited(DRIVER_DIRS, i++)) != NULL) {
- SelfDirectory = StrDuplicate(SelfDirPath);
+ SelfDirectory = SelfDirPath ? StrDuplicate(SelfDirPath) : NULL;
CleanUpPathNameSlashes(SelfDirectory);
MergeStrings(&SelfDirectory, Directory, L'\\');
NumFound += ScanDriverDir(SelfDirectory);
- FreePool(Directory);
- FreePool(SelfDirectory);
+ MyFreePool(Directory);
+ MyFreePool(SelfDirectory);
}
// Scan additional user-specified driver directories....
while ((Directory = FindCommaDelimited(GlobalConfig.DriverDirs, i++)) != NULL) {
CleanUpPathNameSlashes(Directory);
Length = StrLen(Directory);
- if (Length > 0)
+ if (Length > 0) {
NumFound += ScanDriverDir(Directory);
- FreePool(Directory);
+ } // if
+ MyFreePool(Directory);
} // while
// connect all devices
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 ");
+#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
+ 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;
// Add the second-row tags containing built-in and external tools (EFI shell,
// reboot, etc.)
static VOID ScanForTools(VOID) {
- CHAR16 *FileName = NULL;
+ CHAR16 *FileName = NULL, Description[256];
REFIT_MENU_ENTRY *TempMenuEntry;
- UINTN i, j;
+ UINTN i, j, VolumeIndex;
for (i = 0; i < NUM_TOOLS; i++) {
switch(GlobalConfig.ShowTools[i]) {
break;
case TAG_SHELL:
j = 0;
+ MyFreePool(FileName);
while ((FileName = FindCommaDelimited(SHELL_NAMES, j++)) != NULL) {
if (FileExists(SelfRootDir, FileName)) {
- AddToolEntry(FileName, L"EFI Shell", BuiltinIcon(BUILTIN_ICON_TOOL_SHELL), 'S', FALSE);
+ AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"EFI Shell", BuiltinIcon(BUILTIN_ICON_TOOL_SHELL),
+ 'S', FALSE);
}
} // while
break;
case TAG_GPTSYNC:
- MergeStrings(&FileName, L"\\efi\\tools\\gptsync.efi", 0);
+ MyFreePool(FileName);
+ FileName = StrDuplicate(L"\\efi\\tools\\gptsync.efi");
+// MergeStrings(&FileName, L"\\efi\\tools\\gptsync.efi", 0);
if (FileExists(SelfRootDir, FileName)) {
- AddToolEntry(FileName, L"Make Hybrid MBR", BuiltinIcon(BUILTIN_ICON_TOOL_PART), 'P', FALSE);
+ AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"Make Hybrid MBR", BuiltinIcon(BUILTIN_ICON_TOOL_PART), 'P', FALSE);
+ }
+ 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);
+ }
+ } // for
+ break;
+ case TAG_MOK_TOOL:
+ 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
+ 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);
}
break;
} // switch()
- if (FileName != NULL) {
- FreePool(FileName);
- FileName = NULL;
- }
+ MyFreePool(FileName);
+ FileName = NULL;
} // for
} // static VOID ScanForTools
FreeList((VOID ***) &(MainMenu.Entries), &MainMenu.EntryCount);
MainMenu.Entries = NULL;
MainMenu.EntryCount = 0;
- ReadConfig();
+ ReadConfig(CONFIG_FILE_NAME);
ConnectAllDriversToAllControllers();
+ ScanVolumes();
ScanForBootloaders();
ScanForTools();
SetupScreen();
// read configuration
CopyMem(GlobalConfig.ScanFor, "ieom ", NUM_SCAN_OPTIONS);
- ReadConfig();
+ FindLegacyBootType();
+ if (GlobalConfig.LegacyType == LEGACY_TYPE_MAC)
+ CopyMem(GlobalConfig.ScanFor, "ihebocm ", NUM_SCAN_OPTIONS);
+ ReadConfig(CONFIG_FILE_NAME);
+ WarnIfLegacyProblems();
MainMenu.TimeoutSeconds = GlobalConfig.Timeout;
// disable EFI watchdog timer
refit_call4_wrapper(BS->SetWatchdogTimer, 0x0000, 0x0000, 0x0000, NULL);
// further bootstrap (now with config available)
- FindLegacyBootType();
SetupScreen();
+ ScanVolumes();
+ LoadDrivers();
+ ScanForBootloaders();
+ ScanForTools();
+
if (GlobalConfig.ScanDelay > 0) {
BGColor.b = 255;
BGColor.g = 175;
egDisplayMessage(L"Pausing before disk scan; please wait....", &BGColor);
for (i = 0; i < GlobalConfig.ScanDelay; i++)
refit_call1_wrapper(BS->Stall, 1000000);
+ RescanAll();
} // if
- LoadDrivers();
- ScanForBootloaders();
- ScanForTools();
Selection = StrDuplicate(GlobalConfig.DefaultSelection);
while (MainLoopRunning) {
break;
#ifdef __MAKEWITH_TIANO
- case TAG_LEGACY_NON_MAC: // Boot a legacy OS on a non-Mac
+ case TAG_LEGACY_UEFI: // Boot a legacy OS on a non-Mac
StartLegacyUEFI((LEGACY_ENTRY *)ChosenEntry);
break;
#endif // __MAKEWITH_TIANO
break;
} // switch()
- FreePool(Selection);
- Selection = StrDuplicate(ChosenEntry->Title);
+ 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