OcMainLib: Fix bootstrap path left incorrect in the previous commit

melaymei · Jan 31, 2021 · 8c0ca12 · 8c0ca12
1 parent 69ff426
commit 8c0ca12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Include/Acidanthera/Library/OcMainLib.h b/Include/Acidanthera/Library/OcMainLib.h
@@ -50,8 +50,6 @@
 
 #define OPEN_CORE_DRIVER_PATH      L"OpenCore.efi"
 
-#define OPEN_CORE_BOOTSTRAP_PATH   L"Bootstrap\\Bootstrap.efi"
-
 #define OPEN_CORE_CONFIG_PATH      L"config.plist"
 
 #define OPEN_CORE_LOG_PREFIX_PATH  L"opencore"

diff --git a/Library/OcMainLib/OpenCoreMisc.c b/Library/OcMainLib/OpenCoreMisc.c
@@ -623,12 +623,12 @@ RegisterLauncherOption (
   UINTN   BootstrapSize;
 
   if (AsciiStrCmp (LauncherPath, "Default") == 0) {
-    BootstrapSize = StrSize (RootPath) + StrSize (OPEN_CORE_BOOTSTRAP_PATH);
+    BootstrapSize = StrSize (RootPath) + StrSize (OPEN_CORE_DRIVER_PATH);
     BootstrapPath = AllocatePool (BootstrapSize);
     if (BootstrapPath == NULL) {
       return 0;
     }
-    UnicodeSPrint (BootstrapPath, BootstrapSize, L"%s\\%s", RootPath, OPEN_CORE_BOOTSTRAP_PATH);
+    UnicodeSPrint (BootstrapPath, BootstrapSize, L"%s\\%s", RootPath, OPEN_CORE_DRIVER_PATH);
   } else {
     BootstrapPath = AsciiStrCopyToUnicode (LauncherPath, 0);
     if (BootstrapPath == NULL) {
@@ -641,8 +641,8 @@ RegisterLauncherOption (
     LoadHandle,
     BootstrapPath,
     ShortForm,
-    OPEN_CORE_BOOTSTRAP_PATH,
-    L_STR_LEN (OPEN_CORE_BOOTSTRAP_PATH)
+    BootstrapPath,
+    StrLen (BootstrapPath)
     );
   FreePool (BootstrapPath);