summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authordumbbell <dumbbell@FreeBSD.org>2014-10-23 13:32:01 +0000
committerdumbbell <dumbbell@FreeBSD.org>2014-10-23 13:32:01 +0000
commit5cd9154e6b001d9a51411bda3dee8ccb089a7a82 (patch)
tree890dc9086b318e7293cd38de9cf19361fab4f46a /sys/dev
parent9d96d4ad456bb1d6185c8b52be2b43da186ff04d (diff)
downloadFreeBSD-src-5cd9154e6b001d9a51411bda3dee8ccb089a7a82.zip
FreeBSD-src-5cd9154e6b001d9a51411bda3dee8ccb089a7a82.tar.gz
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@ruggedinbox.com MFC of: r273330
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/vt/vt_core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index 0ad06dd..396c0b1 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -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);
OpenPOWER on IntegriCloud