Module Name: src
Committed By: maxv
Date: Wed Oct 11 09:53:14 UTC 2017
Modified Files:
src/sys/arch/i386/stand/boot: boot2.c
Log Message:
Reset has_prekern if pkboot fails. Otherwise here:
pkboot wrong_kernel_path
boot netbsd
the prekern still gets invoked in the second command.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/i386/stand/boot/boot2.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/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.67 src/sys/arch/i386/stand/boot/boot2.c:1.68
--- src/sys/arch/i386/stand/boot/boot2.c:1.67 Sat Oct 7 10:26:38 2017
+++ src/sys/arch/i386/stand/boot/boot2.c Wed Oct 11 09:53:14 2017
@@ -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 @@ command_pkboot(char *arg)
extern int has_prekern;
has_prekern = 1;
command_boot(arg);
+ has_prekern = 0;
}
void
