Added "kernel*" as Linux kernel matching string, since Gentoo uses

this by default.

diff --git a/NEWS.txt b/NEWS.txt
index 1285754ea4697db686dd9da3798aaf32ce784954..8ca9348146d2d254edf75446990b28fbc6e993d9 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,6 +1,9 @@
 0.10.1 (??/??/201?):
 --------------------
 
 0.10.1 (??/??/201?):
 --------------------
 

+- Added "kernel*" as a matching pattern for Linux kernels, since this is
+  what Gentoo uses by default.
+

 - The refind-install script can now be run as a symbolic link in Linux.
   This enables creating a /usr/sbin/refind-install link in Linux packages,
   with the binaries stashed wherever the package system likes them. This
 - The refind-install script can now be run as a symbolic link in Linux.
   This enables creating a /usr/sbin/refind-install link in Linux packages,
   with the binaries stashed wherever the package system likes them. This

diff --git a/refind/main.c b/refind/main.c
index f79ef3a81e7526e30cb0516ee58c9698b0786ad5..55ce8d4b50d9c5e8a5617b2dcd99e650d1d6ec90 100644 (file)
--- a/refind/main.c
+++ b/refind/main.c
@@ -141,7 +141,7 @@ EFI_GUID gFreedesktopRootGuid = { 0xb921b045, 0x1df0, 0x41c3, { 0xaf, 0x44, 0x4c
 // 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.
 // 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*"
+#define LINUX_MATCH_PATTERNS    L"vmlinuz*,bzImage*,kernel*"

 
 // Maximum length of a text string in certain menus
 #define MAX_LINE_LENGTH 65
 
 // Maximum length of a text string in certain menus
 #define MAX_LINE_LENGTH 65


@@ -193,7 +193,7 @@ static VOID AboutrEFInd(VOID)
 
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
 
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);

-        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.10.0.1");
+        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.10.0.2");

         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2015 Roderick W. Smith");
         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2015 Roderick W. Smith");


@@ -1003,7 +1003,7 @@ VOID SetLoaderDefaults(LOADER_ENTRY *Entry, CHAR16 *LoaderPath, REFIT_VOLUME *Vo
     } // if/else network boot
 
     // detect specific loaders
     } // if/else network boot
 
     // detect specific loaders

-    if (StriSubCmp(L"bzImage", NameClues) || StriSubCmp(L"vmlinuz", NameClues)) {
+    if (StriSubCmp(L"bzImage", NameClues) || StriSubCmp(L"vmlinuz", NameClues) || StriSubCmp(L"kernel", NameClues)) {

         if (Volume->DiskKind != DISK_KIND_NET) {
             GuessLinuxDistribution(&OSIconName, Volume, LoaderPath);
             Entry->LoadOptions = GetMainLinuxOptions(LoaderPath, Volume);
         if (Volume->DiskKind != DISK_KIND_NET) {
             GuessLinuxDistribution(&OSIconName, Volume, LoaderPath);
             Entry->LoadOptions = GetMainLinuxOptions(LoaderPath, Volume);


@@ -1417,7 +1417,9 @@ static BOOLEAN ScanLoaderDir(IN REFIT_VOLUME *Volume, IN CHAR16 *Path, IN CHAR16
 
        NewLoader = LoaderList;
        while (NewLoader != NULL) {
 
        NewLoader = LoaderList;
        while (NewLoader != NULL) {

-           IsLinux = (StriSubCmp(L"bzImage", NewLoader->FileName) || StriSubCmp(L"vmlinuz", NewLoader->FileName));
+           IsLinux = (StriSubCmp(L"bzImage", NewLoader->FileName) ||
+                      StriSubCmp(L"vmlinuz", NewLoader->FileName) ||
+                      StriSubCmp(L"kernel", NewLoader->FileName));

            if ((FirstKernel != NULL) && IsLinux && GlobalConfig.FoldLinuxKernels) {
                AddKernelToSubmenu(FirstKernel, NewLoader->FileName, Volume);
            } else {
            if ((FirstKernel != NULL) && IsLinux && GlobalConfig.FoldLinuxKernels) {
                AddKernelToSubmenu(FirstKernel, NewLoader->FileName, Volume);
            } else {