[src/trunk]: src/sys/dev/wsfb Do not replay the msgbuf if we are booting sile...

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

details:   https://anonhg.NetBSD.org/src/rev/9c88946811eb
branches:  trunk
changeset: 849213:9c88946811eb
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Feb 23 14:44:23 2020 +0000

description:
Do not replay the msgbuf if we are booting silent or quiet.

diffstat:

 sys/dev/wsfb/genfb.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 61e24362d9a6 -r 9c88946811eb sys/dev/wsfb/genfb.c
--- a/sys/dev/wsfb/genfb.c      Sun Feb 23 11:17:03 2020 +0000
+++ b/sys/dev/wsfb/genfb.c      Sun Feb 23 14:44:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfb.c,v 1.70 2019/08/09 17:22:02 rin Exp $ */
+/*     $NetBSD: genfb.c,v 1.71 2020/02/23 14:44:23 martin Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.70 2019/08/09 17:22:02 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.71 2020/02/23 14:44:23 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,6 +39,7 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
+#include <sys/reboot.h>
 
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
@@ -53,7 +54,6 @@
 #include <dev/videomode/edidvar.h>
 
 #ifdef GENFB_DISABLE_TEXT
-#include <sys/reboot.h>
 #define DISABLESPLASH (boothowto & (RB_SINGLE | RB_USERCONF | RB_ASKNAME | \
                AB_VERBOSE | AB_DEBUG) )
 #endif
@@ -342,7 +342,7 @@
        }
 #else
        genfb_init_palette(sc);
-       if (console)
+       if (console && (boothowto & (AB_SILENT|AB_QUIET)) == 0)
                vcons_replay_msgbuf(&sc->sc_console_screen);
 #endif