d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suspend vt(4) initialization if "kern.vt.disable" kenv is set.

Browse Source 
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Aleksandr Rybalko 2014-06-18 22:30:22 +00:00
parent 3fc3ca2652
commit b229e4727b
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/vt/vt_consolectl.c
View File

@ -73,6 +73,8 @@ static void
consolectl_drvinit(void *unused)
{
if (getenv("kern.vt.disable"))
return;
make_dev(&consolectl_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
"consolectl");
}

11
sys/dev/vt/vt_core.c
View File

@ -215,6 +215,8 @@ static void
vt_update_static(void *dummy)
{
if (getenv("kern.vt.disable"))
return;
if (main_vd->vd_driver != NULL)
printf("VT: running with driver \"%s\".\n",
main_vd->vd_driver->vd_name);
@ -957,6 +959,9 @@ vtterm_cnprobe(struct terminal *tm, struct consdev *cp)
struct vt_device *vd = vw->vw_device;
struct winsize wsz;
if (getenv("kern.vt.disable"))
return;
if (vd->vd_flags & VDF_INITIALIZED)
/* Initialization already done. */
return;
@ -1991,6 +1996,9 @@ vt_upgrade(struct vt_device *vd)
struct vt_window *vw;
unsigned int i;
if (getenv("kern.vt.disable"))
return;
for (i = 0; i < VT_MAXWINDOWS; i++) {
vw = vd->vd_windows[i];
if (vw == NULL) {
@ -2056,6 +2064,9 @@ vt_allocate(struct vt_driver *drv, void *softc)
struct vt_device *vd;
struct winsize wsz;
if (getenv("kern.vt.disable"))
return;
if (main_vd->vd_driver == NULL) {
main_vd->vd_driver = drv;
printf("VT: initialize with new VT driver \"%s\".\n",

2
sys/dev/vt/vt_sysmouse.c
View File

@ -405,6 +405,8 @@ static void
sysmouse_drvinit(void *unused)
{
if (getenv("kern.vt.disable"))
return;
mtx_init(&sysmouse_lock, "sysmouse", NULL, MTX_DEF);
cv_init(&sysmouse_sleep, "sysmrd");
make_dev(&sysmouse_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,