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

Print a message when disks are found but no logical partition are

Browse Source 
reported by EFI implementation. This address comment on r301714.

Approved by:	re (gjb), andrew (mentor)
Differential Revision:	https://reviews.freebsd.org/D6787
This commit is contained in:
Emmanuel Vadot 2016-06-17 17:09:22 +00:00
parent b819e1ed19
commit e40bf91460
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/boot/efi/libefi/efipart.c
View File

@ -82,7 +82,7 @@ efipart_init(void)
EFI_HANDLE *hin, *hout, *aliases, handle;
EFI_STATUS status;
UINTN sz;
u_int n, nin, nout;
u_int n, nin, nout, nrdisk;
int err;
sz = 0;
@ -103,6 +103,7 @@ efipart_init(void)
hout = hin + nin;
aliases = hout + nin;
nout = 0;
nrdisk = 0;
bzero(aliases, nin * sizeof(EFI_HANDLE));
pdinfo = malloc(nin * sizeof(*pdinfo));
@ -120,8 +121,7 @@ efipart_init(void)
if (EFI_ERROR(status))
continue;
if (!blkio->Media->LogicalPartition) {
printf("%s%d isn't a logical partition, skipping\n",
efipart_dev.dv_name, n);
nrdisk++;
continue;
}
@ -156,6 +156,9 @@ efipart_init(void)
bcache_add_dev(npdinfo);
err = efi_register_handles(&efipart_dev, hout, aliases, nout);
free(hin);
if (nout == 0 && nrdisk > 0)
printf("Found %d disk(s) but no logical partition\n", nrdisk);
return (err);
}