X-Git-Url: https://code.delx.au/refind/blobdiff_plain/7e41f7799b358fdd955115c904e5862cb1efc44d..c9ff72d4b0e75b0683497678aff962911a9364fe:/refind/main.c diff --git a/refind/main.c b/refind/main.c index 41feccc..03b53cc 100644 --- a/refind/main.c +++ b/refind/main.c @@ -55,7 +55,7 @@ // // variables -#define MACOSX_LOADER_PATH L"\\System\\Library\\CoreServices\\boot.efi" +#define MACOSX_LOADER_PATH L"System\\Library\\CoreServices\\boot.efi" #if defined (EFIX64) #define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shellx64.efi" #elif defined (EFI32) @@ -64,6 +64,18 @@ #define SHELL_NAMES L"\\EFI\\tools\\shell.efi" #endif +// 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 +// no harm on other computers, AFAIK. In theory, every case variation should be done for +// completeness, but that's ridiculous.... +#define LOADER_MATCH_PATTERNS L"*.efi,*.EFI" + +// Patterns that identify Linux kernels. Added to the loader match pattern when the +// scan_all_linux_kernels option is set in the configuration file. Causes kernels WITHOUT +// a ".efi" extension to be found when scanning for boot loaders. +#define LINUX_MATCH_PATTERNS L"vmlinuz*,bzImage*" + 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 }; @@ -73,7 +85,7 @@ static REFIT_MENU_ENTRY MenuEntryExit = { L"Exit rEFInd", TAG_EXIT, 1, 0, 0, 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 }; -REFIT_CONFIG GlobalConfig = { FALSE, 20, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, +REFIT_CONFIG GlobalConfig = { FALSE, FALSE, 20, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, {TAG_SHELL, TAG_ABOUT, TAG_SHUTDOWN, TAG_REBOOT, 0, 0, 0, 0, 0 }}; // @@ -84,7 +96,7 @@ static VOID AboutrEFInd(VOID) { if (AboutMenu.EntryCount == 0) { AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT); - AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.2.6.2"); + AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.2.7.3"); AddMenuInfoLine(&AboutMenu, L""); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer"); AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith"); @@ -615,7 +627,7 @@ LOADER_ENTRY * AddLoaderEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN Entry = InitializeLoaderEntry(NULL); if (Entry != NULL) { Entry->Title = StrDuplicate(LoaderTitle); - Entry->me.Title = PoolPrint(L"Boot %s from %s", (LoaderTitle != NULL) ? LoaderTitle : LoaderPath + 1, Volume->VolName); + Entry->me.Title = PoolPrint(L"Boot %s from %s", (LoaderTitle != NULL) ? LoaderTitle : LoaderPath, Volume->VolName); Entry->me.Row = 0; Entry->me.BadgeImage = Volume->VolBadgeImage; Entry->LoaderPath = StrDuplicate(LoaderPath); @@ -631,26 +643,18 @@ LOADER_ENTRY * AddLoaderEntry(IN CHAR16 *LoaderPath, IN CHAR16 *LoaderTitle, IN // Scan an individual directory for EFI boot loader files and, if found, // add them to the list. -static VOID ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path) +static VOID ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16 *Pattern) { EFI_STATUS Status; REFIT_DIR_ITER DirIter; EFI_FILE_INFO *DirEntry; - CHAR16 FileName[256], *SelfPath; - UINTN i = 0; - - // Skip past leading slashes, which are sometimes (but not always) included - // in SelfDirPath, to get a path that's known to never include this feature. - while ((SelfDirPath != NULL) && (SelfDirPath[i] == L'\\')) { - i++; - } - SelfPath = &SelfDirPath[i]; // NOTE: *DO NOT* call FreePool() on SelfPath!!! + CHAR16 FileName[256]; - if (!SelfPath || !Path || ((StriCmp(Path, SelfPath) == 0) && Volume != SelfVolume) || - (StriCmp(Path, SelfPath) != 0)) { + if (!SelfDirPath || !Path || ((StriCmp(Path, SelfDirPath) == 0) && Volume != SelfVolume) || + (StriCmp(Path, SelfDirPath) != 0)) { // look through contents of the directory DirIterOpen(Volume->RootDir, Path, &DirIter); - while (DirIterNext(&DirIter, 2, L"*.efi", &DirEntry)) { + while (DirIterNext(&DirIter, 2, Pattern, &DirEntry)) { if (DirEntry->FileName[0] == '.' || StriCmp(DirEntry->FileName, L"TextMode.efi") == 0 || StriCmp(DirEntry->FileName, L"ebounce.efi") == 0 || @@ -679,9 +683,13 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { EFI_STATUS Status; REFIT_DIR_ITER EfiDirIter; EFI_FILE_INFO *EfiDirEntry; - CHAR16 FileName[256], *Directory; + CHAR16 FileName[256], *Directory, *MatchPatterns; UINTN i, Length; + 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 StrCpy(FileName, MACOSX_LOADER_PATH); @@ -690,19 +698,19 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { } // check for XOM - StrCpy(FileName, L"\\System\\Library\\CoreServices\\xom.efi"); + StrCpy(FileName, L"System\\Library\\CoreServices\\xom.efi"); if (FileExists(Volume->RootDir, FileName)) { AddLoaderEntry(FileName, L"Windows XP (XoM)", Volume); } // check for Microsoft boot loader/menu - StrCpy(FileName, L"\\EFI\\Microsoft\\Boot\\Bootmgfw.efi"); + StrCpy(FileName, L"EFI\\Microsoft\\Boot\\Bootmgfw.efi"); if (FileExists(Volume->RootDir, FileName)) { AddLoaderEntry(FileName, L"Microsoft EFI boot", Volume); } // scan the root directory for EFI executables - ScanLoaderDir(Volume, NULL); + ScanLoaderDir(Volume, NULL, MatchPatterns); // scan subdirectories of the EFI directory (as per the standard) DirIterOpen(Volume->RootDir, L"EFI", &EfiDirIter); @@ -710,7 +718,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { if (StriCmp(EfiDirEntry->FileName, L"tools") == 0 || EfiDirEntry->FileName[0] == '.') continue; // skip this, doesn't contain boot loaders SPrint(FileName, 255, L"EFI\\%s", EfiDirEntry->FileName); - ScanLoaderDir(Volume, FileName); + ScanLoaderDir(Volume, FileName, MatchPatterns); } // while() Status = DirIterClose(&EfiDirIter); if (Status != EFI_NOT_FOUND) @@ -726,7 +734,7 @@ static VOID ScanEfiFiles(REFIT_VOLUME *Volume) { Directory[--Length] = 0; } // while if (Length > 0) - ScanLoaderDir(Volume, Directory); + ScanLoaderDir(Volume, Directory, MatchPatterns); FreePool(Directory); } // while } // if @@ -1126,7 +1134,7 @@ static UINTN ScanDriverDir(IN CHAR16 *Path) // look through contents of the directory DirIterOpen(SelfRootDir, Path, &DirIter); - while (DirIterNext(&DirIter, 2, L"*.efi", &DirEntry)) { + while (DirIterNext(&DirIter, 2, LOADER_MATCH_PATTERNS, &DirEntry)) { if (DirEntry->FileName[0] == '.') continue; // skip this @@ -1156,11 +1164,6 @@ static EFI_STATUS ConnectAllDriversToAllControllers(VOID) BOOLEAN Parent; BOOLEAN Device; - // GNU EFI's EFI_BOOT_SERVICES data structure is truncated, but all the - // items are in memory, so point a more complete data structure to it - // so that we can use items not in GNU EFI's implementation.... -// gBS = (MY_BOOT_SERVICES*) BS; - Status = LibLocateHandle(AllHandles, NULL, NULL, @@ -1221,7 +1224,12 @@ static VOID LoadDrivers(VOID) CHAR16 *Directory; UINTN i = 0, Length, NumFound = 0; - // Scan user-specified driver directories.... + // load drivers from the "drivers" subdirectory of rEFInd's home directory + Directory = StrDuplicate(SelfDirPath); + MergeStrings(&Directory, L"drivers", L'\\'); + NumFound += ScanDriverDir(Directory); + + // Scan additional user-specified driver directories.... while ((Directory = FindCommaDelimited(GlobalConfig.DriverDirs, i++)) != NULL) { Length = StrLen(Directory); // Some EFI implementations won't read a directory if the path ends in