From bd8afe2477108733f19a3171f80f6c8d9daef3bf Mon Sep 17 00:00:00 2001 From: ray Date: Mon, 14 Apr 2014 12:40:37 +0000 Subject: MFC 264242,264244,264259 Fix panic on load new driver while vt(4) is in VGA textmode. o Mute terminal while vt(4) driver change in progress. o Reset VDF_TEXTMODE before init new driver. o Assign default font, if new driver is not in TEXTMODE. o Do not update screen while driver changing. o Unmute terminal when done with driver replacement. o Move init fonts to early point. o Minor cleanup. o Do not fill screen, while muted. (kern/subr_terminal.c) Sponsored by: The FreeBSD Foundation --- sys/kern/subr_terminal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/kern/subr_terminal.c') diff --git a/sys/kern/subr_terminal.c b/sys/kern/subr_terminal.c index a3ccbaa..5f8ffec 100644 --- a/sys/kern/subr_terminal.c +++ b/sys/kern/subr_terminal.c @@ -208,7 +208,7 @@ terminal_set_winsize_blank(struct terminal *tm, const struct winsize *size, teken_set_winsize(&tm->tm_emulator, &r.tr_end); TERMINAL_UNLOCK(tm); - if (blank != 0) + if ((blank != 0) && !(tm->tm_flags & TF_MUTE)) tm->tm_class->tc_fill(tm, &r, TCHAR_CREATE((teken_char_t)' ', &default_message)); -- cgit v1.1