svn commit: r274085 - in head: . sys/kern sys/sys

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Tue Nov  4 10:18:03 2014
New Revision: 274085
URL: https://svnweb.freebsd.org/changeset/base/274085

Log:
  Enable vt(4) by default
  
  vt(4) is a new console driver which brings features such as:
      o  Support for Unicode and double-width characters
      o  Integration with the KMS kernel video drivers
      o  Support for UEFI
  
  You may need to update your console settings in /etc/rc.conf, most
  probably the keymap. During boot, /etc/rc.d/syscons will indicate what
  you need to do.
  
  vt(4) still has issues and lacks some features compared to syscons(4).
  See the wiki for up-to-date information:
      https://wiki.freebsd.org/Newcons
  
  If you want to keep using syscons(4), you can do so by adding the
  following line to /boot/loader.conf:
      kern.vty=sc
  
  Differential Revision:	https://reviews.freebsd.org/D1005
  Discussed with:	emaste@, nwhitehorn@, ray@
  Relnotes:	yes

Modified:
  head/UPDATING
  head/sys/kern/kern_cons.c
  head/sys/sys/param.h

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Tue Nov  4 09:56:58 2014	(r274084)
+++ head/UPDATING	Tue Nov  4 10:18:03 2014	(r274085)
@@ -31,6 +31,24 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20141104:
+	vt(4), the new console driver, is enabled by default. It brings
+	support for Unicode and double-width characters, as well as
+	support for UEFI and integration with the KMS kernel video
+	drivers.
+
+	You may need to update your console settings in /etc/rc.conf,
+	most probably the keymap. During boot, /etc/rc.d/syscons will
+	indicate what you need to do.
+
+	vt(4) still has issues and lacks some features compared to
+	syscons(4). See the wiki for up-to-date information:
+	  https://wiki.freebsd.org/Newcons
+
+	If you want to keep using syscons(4), you can do so by adding
+	the following line to /boot/loader.conf:
+	  kern.vty=sc
+
 20141102:
 	pjdfstest has been integrated into kyua as an opt-in test suite.
 	Please see share/doc/pjdfstest/README for a more details on how to

Modified: head/sys/kern/kern_cons.c
==============================================================================
--- head/sys/kern/kern_cons.c	Tue Nov  4 09:56:58 2014	(r274084)
+++ head/sys/kern/kern_cons.c	Tue Nov  4 10:18:03 2014	(r274085)
@@ -689,10 +689,10 @@ vty_enabled(unsigned vty)
 				vty_selected = vty_prefer;
 				break;
 			}
-#if defined(DEV_SC)
-			vty_selected = VTY_SC;
-#elif defined(DEV_VT)
+#if defined(DEV_VT)
 			vty_selected = VTY_VT;
+#elif defined(DEV_SC)
+			vty_selected = VTY_SC;
 #endif
 		} while (0);
 

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Tue Nov  4 09:56:58 2014	(r274084)
+++ head/sys/sys/param.h	Tue Nov  4 10:18:03 2014	(r274085)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100042	/* Master, propagated to newvers */
+#define __FreeBSD_version 1100043	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,