svn commit: r273545 - stable/10/sys/dev/vt

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Thu Oct 23 13:32:01 2014
New Revision: 273545
URL: https://svnweb.freebsd.org/changeset/base/273545

Log:
  vt(4): Refuse to load a font if hw.vga.textmode is selected
  
  Before, the font was loaded and the window size recalculated, giving an
  unusable terminal, even if the actual font didn't change.
  
  Reported by:	beeessdee at ruggedinbox.com
  MFC of:		r273330

Modified:
  stable/10/sys/dev/vt/vt_core.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/vt/vt_core.c
==============================================================================
--- stable/10/sys/dev/vt/vt_core.c	Thu Oct 23 12:38:05 2014	(r273544)
+++ stable/10/sys/dev/vt/vt_core.c	Thu Oct 23 13:32:01 2014	(r273545)
@@ -2200,6 +2200,9 @@ skip_thunk:
 	case PIO_VFONT: {
 		struct vt_font *vf;
 
+		if (vd->vd_flags & VDF_TEXTMODE)
+			return (ENOTSUP);
+
 		error = vtfont_load((void *)data, &vf);
 		if (error != 0)
 			return (error);