Author: ray
Date: Wed Jun 18 22:30:22 2014
New Revision: 267626
URL: http://svnweb.freebsd.org/changeset/base/267626
Log:
Suspend vt(4) initialization if "kern.vt.disable" kenv is set.
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/vt/vt_consolectl.c
head/sys/dev/vt/vt_core.c
head/sys/dev/vt/vt_sysmouse.c
Modified: head/sys/dev/vt/vt_consolectl.c
==============================================================================
--- head/sys/dev/vt/vt_consolectl.c Wed Jun 18 22:23:10 2014
(r267625)
+++ head/sys/dev/vt/vt_consolectl.c Wed Jun 18 22:30:22 2014
(r267626)
@@ -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");
}
Modified: head/sys/dev/vt/vt_core.c
==============================================================================
--- head/sys/dev/vt/vt_core.c Wed Jun 18 22:23:10 2014 (r267625)
+++ head/sys/dev/vt/vt_core.c Wed Jun 18 22:30:22 2014 (r267626)
@@ -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, stru
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
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",
Modified: head/sys/dev/vt/vt_sysmouse.c
==============================================================================
--- head/sys/dev/vt/vt_sysmouse.c Wed Jun 18 22:23:10 2014
(r267625)
+++ head/sys/dev/vt/vt_sysmouse.c Wed Jun 18 22:30:22 2014
(r267626)
@@ -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,
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
