mirrors/limine
1
0
Fork 0
mirror of https://github.com/limine-bootloader/limine synced 2024-12-12 09:44:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

efi: Add fallback in case we do not manage to pair the boot device handle with a volume

Browse Source
This commit is contained in:
mintsuki 2021-09-02 02:11:15 +02:00
parent 1a71851c7d
commit b00845fba0
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
stage23/entry.s3.c
View File

@ -62,8 +62,38 @@ void uefi_entry(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) {
disk_create_index(); disk_create_index();
boot_volume = NULL;
EFI_HANDLE current_handle = ImageHandle; EFI_HANDLE current_handle = ImageHandle;
for (;;) { for (;;) {
if (current_handle == NULL) {
print("WARNING: Could not meaningfully match the boot device handle with a volume.\n");
print(" Using the first volume containing a Limine configuration!\n");
for (size_t i = 0; i < volume_index_i; i++) {
struct file_handle f;
if (fopen(&f, volume_index[i], "/limine.cfg")
&& fopen(&f, volume_index[i], "/boot/limine.cfg")
&& fopen(&f, volume_index[i], "/EFI/BOOT/limine.cfg")) {
continue;
}
if (volume_index[i]->backing_dev != NULL) {
boot_volume = volume_index[i]->backing_dev;
} else {
boot_volume = volume_index[i];
}
break;
}
if (boot_volume != NULL)
stage3_common();
panic("No volume contained a Limine configuration file");
}
EFI_GUID loaded_img_prot_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID; EFI_GUID loaded_img_prot_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;
EFI_LOADED_IMAGE_PROTOCOL *loaded_image = NULL; EFI_LOADED_IMAGE_PROTOCOL *loaded_image = NULL;