]> code.delx.au - refind/commitdiff
Previous commit broke loading of EFI drivers with SB active; fix it.
authorsrs5694 <srs5694@users.sourceforge.net>
Tue, 24 Nov 2015 14:49:16 +0000 (09:49 -0500)
committersrs5694 <srs5694@users.sourceforge.net>
Tue, 24 Nov 2015 14:49:16 +0000 (09:49 -0500)
refind/main.c

index e98719fa3aa69be5d9248475ed32c87f6efb2d57..6e963674200e04b62247e401c46bcfa68f548b99 100644 (file)
@@ -2190,6 +2190,7 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
     if (GlobalConfig.LegacyType == LEGACY_TYPE_MAC)
        CopyMem(GlobalConfig.ScanFor, "ihebocm   ", NUM_SCAN_OPTIONS);
     SetConfigFilename(ImageHandle);
+    MokProtocol = SecureBootSetup();
     LoadDrivers();
     ScanVolumes(); // Do before ReadConfig() because it needs SelfVolume->VolName
     ReadConfig(GlobalConfig.ConfigFilename);
@@ -2205,7 +2206,6 @@ efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
     refit_call4_wrapper(BS->SetWatchdogTimer, 0x0000, 0x0000, 0x0000, NULL);
 
     // further bootstrap (now with config available)
-    MokProtocol = SecureBootSetup();
     ScanForBootloaders();
     ScanForTools();
     SetupScreen();