From: srs5694 Date: Tue, 24 Nov 2015 14:49:16 +0000 (-0500) Subject: Previous commit broke loading of EFI drivers with SB active; fix it. X-Git-Url: https://code.delx.au/refind/commitdiff_plain/a8a06ba01058e3ef5f546a4a4a352d06638359a8 Previous commit broke loading of EFI drivers with SB active; fix it. --- diff --git a/refind/main.c b/refind/main.c index e98719f..6e96367 100644 --- a/refind/main.c +++ b/refind/main.c @@ -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();