[src/trunk]: src/sys/arch/i386/stand/boot Reset has_prekern if pkboot fails. ...

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

details:   https://anonhg.NetBSD.org/src/rev/133b37208bd5
branches:  trunk
changeset: 827064:133b37208bd5
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Oct 11 09:53:14 2017 +0000

description:
Reset has_prekern if pkboot fails. Otherwise here:
        pkboot wrong_kernel_path
        boot netbsd
the prekern still gets invoked in the second command.

diffstat:

 sys/arch/i386/stand/boot/boot2.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r d940306aae67 -r 133b37208bd5 sys/arch/i386/stand/boot/boot2.c
--- a/sys/arch/i386/stand/boot/boot2.c  Wed Oct 11 08:29:17 2017 +0000
+++ b/sys/arch/i386/stand/boot/boot2.c  Wed Oct 11 09:53:14 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot2.c,v 1.67 2017/10/07 10:26:38 maxv Exp $  */
+/*     $NetBSD: boot2.c,v 1.68 2017/10/11 09:53:14 maxv Exp $  */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -477,6 +477,7 @@
        extern int has_prekern;
        has_prekern = 1;
        command_boot(arg);
+       has_prekern = 0;
 }
 
 void