Work around problem with (bogus, I think) "invalid parameter" errors

from some EFIs when scanning directories.

diff --git a/NEWS.txt b/NEWS.txt
index 724ad0d7f51570eebd0d4e5b1d26b7bc6b691182..93f0eff9dd1f408d675562a9ca5b1ce1c7602f5e 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,4 +1,14 @@
-0.8.6 (2/8/2016):
+0.8.7 (?/??/2015):
+------------------
+
+- Fixed more instances of "invalid parameter" errors on some EFIs.
+
+- Improved Secure Boot detection in install.sh.
+
+- install.sh should no longer complain when copying Shim or MokManager over
+  itself.
+
+0.8.6 (2/8/2015):
 -----------------
 
 - Removed special case of ignoring an HFS+ name of "HFS+ volume", since the

diff --git a/refind/main.c b/refind/main.c
index 8c27da28967fb74b4f1e7008c24ff2b404f47c4b..a7da9844f093d2dc0dbf865c5a7af0e2be78bfd4 100644 (file)
--- a/refind/main.c
+++ b/refind/main.c
@@ -166,7 +166,7 @@ static VOID AboutrEFInd(VOID)
 
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
-        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.6.1");
+        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.8.6.2");
         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2015 Roderick W. Smith");
@@ -1472,7 +1472,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....
@@ -1613,7 +1613,7 @@ static UINTN ScanDriverDir(IN CHAR16 *Path)
                                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);
     }