Module Name: src
Committed By: nonaka
Date: Sat Jan 18 19:25:58 UTC 2020
Modified Files:
src/sys/arch/i386/stand/efiboot: devopen.c
Log Message:
x86 efiboot: Fixed the problem that /EFI/NetBSD/boot.cfg could not be loaded.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/stand/efiboot/devopen.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/arch/i386/stand/efiboot/devopen.c
diff -u src/sys/arch/i386/stand/efiboot/devopen.c:1.10 src/sys/arch/i386/stand/efiboot/devopen.c:1.11
--- src/sys/arch/i386/stand/efiboot/devopen.c:1.10 Sat Jan 18 19:20:23 2020
+++ src/sys/arch/i386/stand/efiboot/devopen.c Sat Jan 18 19:25:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.10 2020/01/18 19:20:23 nonaka Exp $ */
+/* $NetBSD: devopen.c,v 1.11 2020/01/18 19:25:58 nonaka Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ bios2dev(int biosdev, daddr_t sector, ch
*devname = "hd";
(void)biosdisk_findpartition(biosdev, sector, partition, part_name);
- if (*part_name != NULL) {
+ if (part_name != NULL && *part_name != NULL) {
snprintf(savedevname, sizeof(savedevname),
"NAME=%s", *part_name);
*devname = savedevname;
