Module Name: src
Committed By: martin
Date: Tue Jan 21 16:55:04 UTC 2020
Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-8]: devopen.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1485):
sys/arch/i386/stand/efiboot/devopen.c: revision 1.10
sys/arch/i386/stand/efiboot/devopen.c: revision 1.11
fix indent.
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.1.12.7 -r1.1.12.8 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.1.12.7 src/sys/arch/i386/stand/efiboot/devopen.c:1.1.12.8
--- src/sys/arch/i386/stand/efiboot/devopen.c:1.1.12.7 Tue Dec 17 12:19:49 2019
+++ src/sys/arch/i386/stand/efiboot/devopen.c Tue Jan 21 16:55:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.1.12.7 2019/12/17 12:19:49 martin Exp $ */
+/* $NetBSD: devopen.c,v 1.1.12.8 2020/01/21 16:55:03 martin Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -100,10 +100,10 @@ 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;
+ *devname = savedevname;
}
}
