[src/trunk]: src/sys/arch/i386/stand/efiboot x86 efiboot: Fixed the problem t...

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/41ebf77e9d07
branches:  trunk
changeset: 467266:41ebf77e9d07
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Sat Jan 18 19:25:58 2020 +0000

description:
x86 efiboot: Fixed the problem that /EFI/NetBSD/boot.cfg could not be loaded.

diffstat:

 sys/arch/i386/stand/efiboot/devopen.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r b4b32ec088e5 -r 41ebf77e9d07 sys/arch/i386/stand/efiboot/devopen.c
--- a/sys/arch/i386/stand/efiboot/devopen.c     Sat Jan 18 19:20:23 2020 +0000
+++ b/sys/arch/i386/stand/efiboot/devopen.c     Sat Jan 18 19:25:58 2020 +0000
@@ -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 @@
                *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;