Module Name: src
Committed By: martin
Date: Sun Feb 23 14:44:24 UTC 2020
Modified Files:
src/sys/dev/wsfb: genfb.c
Log Message:
Do not replay the msgbuf if we are booting silent or quiet.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/wsfb/genfb.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/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.70 src/sys/dev/wsfb/genfb.c:1.71
--- src/sys/dev/wsfb/genfb.c:1.70 Fri Aug 9 17:22:02 2019
+++ src/sys/dev/wsfb/genfb.c Sun Feb 23 14:44:23 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.
#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 @@ __KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.
#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 @@ genfb_attach(struct genfb_softc *sc, str
}
#else
genfb_init_palette(sc);
- if (console)
+ if (console && (boothowto & (AB_SILENT|AB_QUIET)) == 0)
vcons_replay_msgbuf(&sc->sc_console_screen);
#endif
