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

stand: correct mis-merge from r346879

Browse Source 
Small mis-merge from multiple WIP resulted in block io media handles getting
double-initialized. This resulted in some installations oddly landing at the
mountroot prompt.

Reported by:	ler
Reviewed by:	imp
This commit is contained in:
Kyle Evans 2019-05-02 17:01:13 +00:00
parent 2de4a7aa21
commit 83475ff137
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -909,20 +909,6 @@ main(int argc, CHAR16 *argv[])
howto &= ~RB_PROBE; howto &= ~RB_PROBE;
uhowto = parse_uefi_con_out(); uhowto = parse_uefi_con_out();
/*
* Scan the BLOCK IO MEDIA handles then
* march through the device switch probing for things.
*/
i = efipart_inithandles();
if (i != 0 && i != ENOENT) {
printf("efipart_inithandles failed with ERRNO %d, expect "
"failures\n", i);
}
for (i = 0; devsw[i] != NULL; i++)
if (devsw[i]->dv_init != NULL)
(devsw[i]->dv_init)();
/* /*
* Read additional environment variables from the boot device's * Read additional environment variables from the boot device's
* "LoaderEnv" file. Any boot loader environment variable may be set * "LoaderEnv" file. Any boot loader environment variable may be set