Module Name: src
Committed By: jmcneill
Date: Fri Aug 24 23:19:42 UTC 2018
Modified Files:
src/sys/stand/efiboot: efifile.c
Log Message:
If the boot device could not be determined, use the first one found as
the default. While here, remove unnecessary calls to LibFileSystemInfo().
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/stand/efiboot/efifile.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/stand/efiboot/efifile.c
diff -u src/sys/stand/efiboot/efifile.c:1.1 src/sys/stand/efiboot/efifile.c:1.2
--- src/sys/stand/efiboot/efifile.c:1.1 Fri Aug 24 02:01:06 2018
+++ src/sys/stand/efiboot/efifile.c Fri Aug 24 23:19:42 2018
@@ -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 <jmcne...@invisible.ca>
@@ -62,7 +62,6 @@ efi_file_parse(const char *fname, UINTN
void
efi_file_system_probe(void)
{
- EFI_FILE_SYSTEM_INFO *fsi;
EFI_FILE_HANDLE fh;
EFI_STATUS status;
int n;
@@ -76,12 +75,10 @@ efi_file_system_probe(void)
if (!fh)
continue;
- fsi = LibFileSystemInfo(fh);
- if (!fsi)
- continue;
-
if (efi_bootdp && LibMatchDevicePaths(DevicePathFromHandle(efi_vol[n]), efi_bootdp) == TRUE)
efi_bootvol = n;
+ else if (efi_bootdp == NULL && efi_bootvol == -1)
+ efi_bootvol = n;
}
}
