d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader.efi: efipart_inithandles() failure should not prevent devsw initialization

Browse Source 
The efipart_inithandles() can return error code when there are no block devices,
however, we still should walk and initialize devsw.
This commit is contained in:
tsoome 2018-08-02 12:43:40 +00:00
parent ba0e31487b
commit cfb0689495
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
stand/efi/loader/main.c
View File

@ -861,12 +861,15 @@ main(int argc, CHAR16 *argv[])
* Scan the BLOCK IO MEDIA handles then
* march through the device switch probing for things.
*/
if ((i = efipart_inithandles()) == 0) {
for (i = 0; devsw[i] != NULL; i++)
if (devsw[i]->dv_init != NULL)
(devsw[i]->dv_init)();
} else
printf("efipart_inithandles failed %d, expect failures", i);
i = efipart_inithandles();
if (i != 0) {
printf("efipart_inithandles failed with ERRNO %d, expect "
"failures", i);
}
for (i = 0; devsw[i] != NULL; i++)
if (devsw[i]->dv_init != NULL)
(devsw[i]->dv_init)();
printf("%s\n", bootprog_info);
printf(" Command line arguments:");