From c3361cad956357afce614d7fd8750490c2bd3ff9 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 14 Jan 2019 20:44:25 -0500 Subject: [PATCH] bootloader: Load driver settings before the kernel. This way, parts of the bootloader (e.g. the ELF loader) that would like to access driver settings can do so. --- src/system/boot/loader/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/system/boot/loader/main.cpp b/src/system/boot/loader/main.cpp index e6b081e874..6a08a42ef3 100644 --- a/src/system/boot/loader/main.cpp +++ b/src/system/boot/loader/main.cpp @@ -86,6 +86,8 @@ main(stage2_args *args) if (bootVolume.IsValid()) { // we got a volume to boot from! + load_driver_settings(args, bootVolume.RootDirectory()); + status_t status; while ((status = load_kernel(args, bootVolume)) < B_OK) { // loading the kernel failed, so let the user choose another @@ -122,7 +124,6 @@ main(stage2_args *args) platform_switch_to_logo(); load_modules(args, bootVolume); - load_driver_settings(args, bootVolume.RootDirectory()); // apply boot settings apply_boot_settings();