//
// 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"
#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\EFI\\tools\\shellia32.efi,\\shell.efi,\\shellia32.efi"
#define GPTSYNC_NAMES L"\\EFI\\tools\\gptsync.efi,\\EFI\\tools\\gptsync_ia32.efi"
#define GDISK_NAMES L"\\EFI\\tools\\gdisk.efi,\\EFI\\tools\\gdisk_ia32.efi"
+#define NETBOOT_NAMES L"\\EFI\\tools\\ipxe.efi"
#define MEMTEST_NAMES L"memtest86.efi,memtest86_ia32.efi,memtest86ia32.efi,bootia32.efi"
#define DRIVER_DIRS L"drivers,drivers_ia32"
#define FALLBACK_FULLNAME L"EFI\\BOOT\\bootia32.efi"
#define 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 */
#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
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, 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;
if (AboutMenu.EntryCount == 0) {
AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
- AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.1.2");
+ AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.4.1");
AddMenuInfoLine(&AboutMenu, L"");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2014 Roderick W. Smith");
IN CHAR16 *LoadOptions, IN UINTN LoaderType,
IN CHAR16 *ImageTitle, IN CHAR8 OSType,
OUT UINTN *ErrorInStep,
- IN BOOLEAN Verbose)
+ IN BOOLEAN Verbose,
+ IN BOOLEAN IsDriver)
{
EFI_STATUS Status, ReturnStatus;
EFI_HANDLE ChildImageHandle;
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);
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;
return err;
}
+// Record the value of the loader's name/description in rEFInd's "PreviousBoot" EFI variable,
+// if it's different from what's already stored there.
+static VOID StoreLoaderName(IN CHAR16 *Name) {
+ EFI_STATUS Status;
+ CHAR16 *OldName = NULL;
+ UINTN Length;
+
+ if (Name) {
+ Status = EfivarGetRaw(&RefindGuid, L"PreviousBoot", (CHAR8**) &OldName, &Length);
+ if ((Status != EFI_SUCCESS) || (StrCmp(OldName, Name) != 0)) {
+ EfivarSetRaw(&RefindGuid, L"PreviousBoot", (CHAR8*) Name, StrLen(Name) * 2 + 2, TRUE);
+ } // if
+ MyFreePool(OldName);
+ } // if
+} // VOID StoreLoaderName()
//
// EFI OS loader functions
//
-static VOID StartLoader(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();
}
// '\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) {
// 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',');
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) {
+ } else if (StriCmp(NameClues, L"cdboot.efi") == 0 ||
+ StriCmp(NameClues, L"bootmgr.efi") == 0 ||
+ StriCmp(NameClues, L"bootmgfw.efi") == 0 ||
+ StriCmp(NameClues, L"bkpbootmgfw.efi") == 0) {
MergeStrings(&OSIconName, L"win", L',');
Entry->OSType = 'W';
ShortcutLetter = 'W';
Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS;
- } else if (StriCmp(FileName, L"xom.efi") == 0) {
+ } else if (StriCmp(NameClues, L"xom.efi") == 0) {
MergeStrings(&OSIconName, L"xom,win", L',');
Entry->UseGraphicsMode = TRUE;
Entry->OSType = 'X';
ShortcutLetter = 'W';
Entry->UseGraphicsMode = GlobalConfig.GraphicsFor & GRAPHICS_FOR_WINDOWS;
}
+ else if (StriSubCmp(L"ipxe", NameClues)) {
+ Entry->OSType = 'N';
+ ShortcutLetter = 'N';
+ MergeStrings(&OSIconName, L"network", L',');
+ }
if ((ShortcutLetter >= 'a') && (ShortcutLetter <= 'z'))
ShortcutLetter = ShortcutLetter - 'a' + 'A'; // convert lowercase to uppercase
// 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'\\')) {
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;
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;
// 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;
// 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;
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
#define MAX_DISCOVERED_PATHS (16)
-static VOID StartLegacy(IN LEGACY_ENTRY *Entry)
+static VOID StartLegacy(IN LEGACY_ENTRY *Entry, IN CHAR16 *SelectionName)
{
EFI_STATUS Status;
EG_IMAGE *BootLogoImage;
ExtractLegacyLoaderPaths(DiscoveredPathList, MAX_DISCOVERED_PATHS, LegacyLoaderList);
- Status = StartEFIImageList(DiscoveredPathList, Entry->LoadOptions, TYPE_LEGACY, L"legacy loader", 0, &ErrorInStep, TRUE);
+ StoreLoaderName(SelectionName);
+ Status = StartEFIImageList(DiscoveredPathList, Entry->LoadOptions, TYPE_LEGACY, L"legacy loader", 0, &ErrorInStep, TRUE, FALSE);
if (Status == EFI_NOT_FOUND) {
if (ErrorInStep == 1) {
Print(L"\nPlease make sure that you have the latest firmware update installed.\n");
} /* static VOID StartLegacy() */
// Start a device on a non-Mac using the EFI_LEGACY_BIOS_PROTOCOL
-static VOID StartLegacyUEFI(LEGACY_ENTRY *Entry)
+static VOID StartLegacyUEFI(LEGACY_ENTRY *Entry, CHAR16 *SelectionName)
{
BeginExternalScreen(TRUE, L"Booting Legacy OS (UEFI mode)");
+ StoreLoaderName(SelectionName);
BdsLibConnectDevicePath (Entry->BdsOption->DevicePath);
BdsLibDoLegacyBoot(Entry->BdsOption);
static VOID StartTool(IN LOADER_ENTRY *Entry)
{
BeginExternalScreen(Entry->UseGraphicsMode, Entry->me.Title + 6); // assumes "Start <title>" 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() */
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) {
case 'o': case 'O':
ScanOptical();
break;
+ case 'n': case 'N':
+ ScanNetboot();
+ break;
} // switch()
} // for
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
} // while
FileName = NULL;
break;
+
+ case TAG_NETBOOT:
+ j = 0;
+ while ((FileName = FindCommaDelimited(NETBOOT_NAMES, j++)) != NULL) {
+ if (FileExists(SelfRootDir, FileName)) {
+ AddToolEntry(SelfLoadedImage->DeviceHandle, FileName, L"Netboot",
+ BuiltinIcon(BUILTIN_ICON_TOOL_NETBOOT), 'N', FALSE);
+ } // if
+ MyFreePool(FileName);
+ } // while
+ FileName = NULL;
+ break;
case TAG_APPLE_RECOVERY:
FileName = StrDuplicate(L"\\com.apple.recovery.boot\\boot.efi");
BOOLEAN MokProtocol;
REFIT_MENU_ENTRY *ChosenEntry;
UINTN MenuExit, i;
- CHAR16 *Selection = NULL;
+ CHAR16 *SelectionName = NULL;
EG_PIXEL BGColor;
// bootstrap
} // 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) {
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
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