Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the boot device could not be determined, use the first one found as 

the default. While here, remove unnecessary calls to LibFileSystemInfo().
This commit is contained in:
jmcneill 2018-08-24 23:19:42 +00:00
parent decc510df4
commit 3233c35926
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/stand/efiboot/efifile.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: efifile.c,v 1.1 2018/08/24 02:01:06 jmcneill Exp $ */ /* $NetBSD: efifile.c,v 1.2 2018/08/24 23:19:42 jmcneill Exp $ */
/*- /*-
* Copyright (c) 2018 Jared McNeill <jmcneill@invisible.ca> * Copyright (c) 2018 Jared McNeill <jmcneill@invisible.ca>
@ -62,7 +62,6 @@ efi_file_parse(const char *fname, UINTN *pvol, const char **pfile)
void void
efi_file_system_probe(void) efi_file_system_probe(void)
{ {
EFI_FILE_SYSTEM_INFO *fsi;
EFI_FILE_HANDLE fh; EFI_FILE_HANDLE fh;
EFI_STATUS status; EFI_STATUS status;
int n; int n;
@ -76,12 +75,10 @@ efi_file_system_probe(void)
if (!fh) if (!fh)
continue; continue;
fsi = LibFileSystemInfo(fh);
if (!fsi)
continue;
if (efi_bootdp && LibMatchDevicePaths(DevicePathFromHandle(efi_vol[n]), efi_bootdp) == TRUE) if (efi_bootdp && LibMatchDevicePaths(DevicePathFromHandle(efi_vol[n]), efi_bootdp) == TRUE)
efi_bootvol = n; efi_bootvol = n;
else if (efi_bootdp == NULL && efi_bootvol == -1)
efi_bootvol = n;
} }
} }