svn commit: r270647 - in head: etc/defaults share/man/man4 share/man/man5 share/man/man7 share/man/man8

Tue Aug 26 08:13:32 UTC 2014

Author: se
Date: Tue Aug 26 08:13:30 2014
New Revision: 270647
URL: http://svnweb.freebsd.org/changeset/base/270647

Log:
  Add references to vt(4) and the configuration files in /usr7share/vt where
  appropriate (i.e. where syscons was already mentioned and vt supports the
  feature). Comments in defaults/rc.conf are updated to match the contents
  of the modified man-page rc.conf(5).
  
  Reviewed by:	pluknet, emaste
  MFC after:	3 days

Modified:
  head/etc/defaults/rc.conf
  head/share/man/man4/atkbd.4
  head/share/man/man4/kbdmux.4
  head/share/man/man4/splash.4
  head/share/man/man4/ukbd.4
  head/share/man/man4/vkbd.4
  head/share/man/man4/vt.4
  head/share/man/man5/rc.conf.5
  head/share/man/man7/hier.7
  head/share/man/man8/nanobsd.8

Modified: head/etc/defaults/rc.conf
==============================================================================

--- head/etc/defaults/rc.conf	Tue Aug 26 06:31:52 2014	(r270646)
+++ head/etc/defaults/rc.conf	Tue Aug 26 08:13:30 2014	(r270647)
@@ -516,15 +516,15 @@ ip6addrctl_policy="AUTO"	# A pre-defined
 ##############################################################
 
 keyboard=""		# keyboard device to use (default /dev/kbd0).
-keymap="NO"		# keymap in /usr/share/syscons/keymaps/* (or NO).
+keymap="NO"		# keymap in /usr/share/{syscons,vt}/keymaps/* (or NO).
 keyrate="NO"		# keyboard rate to: slow, normal, fast (or NO).
 keybell="NO" 		# See kbdcontrol(1) for options.  Use "off" to disable.
 keychange="NO"		# function keys default values (or NO).
 cursor="NO"		# cursor type {normal|blink|destructive} (or NO).
 scrnmap="NO"		# screen map in /usr/share/syscons/scrnmaps/* (or NO).
-font8x16="NO"		# font 8x16 from /usr/share/syscons/fonts/* (or NO).
-font8x14="NO"		# font 8x14 from /usr/share/syscons/fonts/* (or NO).
-font8x8="NO"		# font 8x8 from /usr/share/syscons/fonts/* (or NO).
+font8x16="NO"		# font 8x16 from /usr/share/{syscons,vt}/fonts/* (or NO).
+font8x14="NO"		# font 8x14 from /usr/share/{syscons,vt}/fonts/* (or NO).
+font8x8="NO"		# font 8x8 from /usr/share/{syscons,vt}/fonts/* (or NO).
 blanktime="300"		# blank time (in seconds) or "NO" to turn it off.
 saver="NO"		# screen saver: Uses /boot/kernel/${saver}_saver.ko
 moused_nondefault_enable="YES" # Treat non-default mice as enabled unless

Modified: head/share/man/man4/atkbd.4
==============================================================================
--- head/share/man/man4/atkbd.4	Tue Aug 26 06:31:52 2014	(r270646)
+++ head/share/man/man4/atkbd.4	Tue Aug 26 08:13:30 2014	(r270647)
@@ -51,7 +51,9 @@ driver, provides access to the AT 84 key
 which is connected to the AT keyboard controller.
 .Pp
 This driver is required for the console driver
-.Xr syscons 4 .
+.Xr syscons 4
+or
+.Xr vt 4 .
 .Pp
 There can be only one
 .Nm
@@ -211,6 +213,7 @@ In both cases, you also need to have fol
 .Xr atkbdc 4 ,
 .Xr psm 4 ,
 .Xr syscons 4 ,
+.Xr vt 4 ,
 .Xr kbdmap 5 ,
 .Xr loader 8
 .Sh HISTORY

Modified: head/share/man/man4/kbdmux.4
==============================================================================
--- head/share/man/man4/kbdmux.4	Tue Aug 26 06:31:52 2014	(r270646)
+++ head/share/man/man4/kbdmux.4	Tue Aug 26 08:13:30 2014	(r270647)
@@ -34,7 +34,8 @@ utility.
 .Xr kbdcontrol 1 ,
 .Xr atkbd 4 ,
 .Xr syscons 4 ,
-.Xr ukbd 4
+.Xr ukbd 4 ,
+.Xr vt 4
 .Sh HISTORY
 The
 .Nm

Modified: head/share/man/man4/splash.4
==============================================================================
--- head/share/man/man4/splash.4	Tue Aug 26 06:31:52 2014	(r270646)
+++ head/share/man/man4/splash.4	Tue Aug 26 08:13:30 2014	(r270647)
@@ -245,6 +245,7 @@ bitmap_name="/boot/splash.bin"
 .Xr vidcontrol 1 ,
 .Xr syscons 4 ,
 .Xr vga 4 ,
+.Xr vt 4 ,
 .Xr loader.conf 5 ,
 .Xr rc.conf 5 ,
 .Xr kldload 8 ,
@@ -285,6 +286,8 @@ code.
 .Sh CAVEATS
 Both the splash screen and the screen saver work with
 .Xr syscons 4
+ or
+.Xr vt 4
 only.
 .Sh BUGS
 If you load a screen saver while another screen saver has already

Modified: head/share/man/man4/ukbd.4
==============================================================================
--- head/share/man/man4/ukbd.4	Tue Aug 26 06:31:52 2014	(r270646)
+++ head/share/man/man4/ukbd.4	Tue Aug 26 08:13:30 2014	(r270647)
@@ -127,7 +127,9 @@ Make the keyboards available through a c
 The above lines will put the French ISO keymap in the ukbd driver.
 You can specify any keymap in
 .Pa /usr/share/syscons/keymaps
-with this option.
+or
+.Pa /usr/share/vt/keymaps
+(depending on the console driver being used) with this option.
 .Pp
 .D1 Cd "options KBD_DISABLE_KEYMAP_LOADING"
 .Pp
@@ -151,6 +153,7 @@ driver to the kernel.
 .Xr syscons 4 ,
 .Xr uhci 4 ,
 .Xr usb 4 ,
+.Xr vt 4 ,
 .Xr config 8
 .Sh AUTHORS
 .An -nosplit

Modified: head/share/man/man4/vkbd.4
==============================================================================
--- head/share/man/man4/vkbd.4	Tue Aug 26 06:31:52 2014	(r270646)
+++ head/share/man/man4/vkbd.4	Tue Aug 26 08:13:30 2014	(r270647)
@@ -129,7 +129,8 @@ All queued scan codes are thrown away.
 .Xr kbdcontrol 1 ,
 .Xr atkbdc 4 ,
 .Xr psm 4 ,
-.Xr syscons 4
+.Xr syscons 4 ,
+.Xr vt 4
 .Sh HISTORY
 The
 .Nm

Modified: head/share/man/man4/vt.4
==============================================================================
--- head/share/man/man4/vt.4	Tue Aug 26 06:31:52 2014	(r270646)
+++ head/share/man/man4/vt.4	Tue Aug 26 08:13:30 2014	(r270647)
@@ -211,13 +211,17 @@ Power down.
 Default is 15, all enabled.
 .El
 .Sh FILES
-.Bl -tag -width /usr/share/syscons/keymaps/* -compact
+.Bl -tag -width /usr/share/vt/keymaps/* -compact
 .It Pa /dev/console
 .It Pa /dev/consolectl
 .It Pa /dev/ttyv*
 virtual terminals
 .It Pa /etc/ttys
 terminal initialization information
+.It Pa /usr/share/vt/fonts/*.fnt
+console fonts
+.It Pa /usr/share/vt/keymaps/*.kbd
+keyboard layouts
 .El
 .Sh EXAMPLES
 This example changes the default color of normal text to green on a
@@ -243,7 +247,6 @@ on a black background, or black on a bri
 .Xr splash 4 ,
 .Xr syscons 4 ,
 .Xr ukbd 4 ,
-.Xr vga 4 ,
 .Xr kbdmap 5 ,
 .Xr rc.conf 5 ,
 .Xr ttys 5 ,

Modified: head/share/man/man5/rc.conf.5
==============================================================================
--- head/share/man/man5/rc.conf.5	Tue Aug 26 06:31:52 2014	(r270646)
+++ head/share/man/man5/rc.conf.5	Tue Aug 26 08:13:30 2014	(r270647)
@@ -3111,8 +3111,13 @@ set to this device.
 If set to
 .Dq Li NO ,
 no keymap is installed, otherwise the value is used to install
-the keymap file in
-.Pa /usr/share/syscons/keymaps/ Ns Ao Ar value Ac Ns Pa .kbd .
+the keymap file found in
+.Pa /usr/share/syscons/keymaps/ Ns Ao Ar value Ac Ns Pa .kbd
+(if using
+.Xr syscons 4 ) or
+.Pa /usr/share/vt/keymaps/ Ns Ao Ar value Ac Ns Pa .kbd
+(if using
+.Xr vt 4 ) .
 .It Va keyrate
 .Pq Vt str
 The keyboard repeat speed.
@@ -3147,6 +3152,9 @@ If set to
 no screen map is installed, otherwise the value is used to install
 the screen map file in
 .Pa /usr/share/syscons/scrnmaps/ Ns Aq Ar value .
+This parameter is ignored when using
+.Xr vt 4
+as the console driver.
 .It Va font8x16
 .Pq Vt str
 If set to
@@ -3154,7 +3162,9 @@ If set to
 the default 8x16 font value is used for screen size requests, otherwise
 the value in
 .Pa /usr/share/syscons/fonts/ Ns Aq Ar value
-is used.
+or
+.Pa /usr/share/vt/fonts/ Ns Aq Ar value
+is used (depending on the console driver being used).
 .It Va font8x14
 .Pq Vt str
 If set to
@@ -3162,7 +3172,9 @@ If set to
 the default 8x14 font value is used for screen size requests, otherwise
 the value in
 .Pa /usr/share/syscons/fonts/ Ns Aq Ar value
-is used.
+or
+.Pa /usr/share/vt/fonts/ Ns Aq Ar value
+is used (depending on the console driver being used).
 .It Va font8x8
 .Pq Vt str
 If set to
@@ -3170,7 +3182,9 @@ If set to
 the default 8x8 font value is used for screen size requests, otherwise
 the value in
 .Pa /usr/share/syscons/fonts/ Ns Aq Ar value
-is used.
+or
+.Pa /usr/share/vt/fonts/ Ns Aq Ar value
+is used (depending on the console driver being used).
 .It Va blanktime
 .Pq Vt int
 If set to
@@ -3377,6 +3391,8 @@ For example,
 .Dq Fl h Li 200
 will set the
 .Xr syscons 4
+or
+.Xr vt 4
 scrollback (history) buffer to 200 lines.
 .It Va cron_enable
 .Pq Vt bool

Modified: head/share/man/man7/hier.7
==============================================================================
--- head/share/man/man7/hier.7	Tue Aug 26 06:31:52 2014	(r270646)
+++ head/share/man/man7/hier.7	Tue Aug 26 08:13:30 2014	(r270647)
@@ -633,6 +633,26 @@ timezone configuration information;
 see
 .Xr tzfile 5
 .El
+.It Pa vt/
+files used by vt;
+see
+.Xr vt 4
+.Bl -tag -width ".Pa scrnmaps/" -compact
+.It Pa fonts/
+console fonts;
+see
+.Xr vidcontrol 1
+and
+.Xr vidfont 1
+.It Pa keymaps/
+console keyboard maps;
+see
+.Xr kbdcontrol 1
+and
+.Xr kbdmap 1
+.\" .It Pa scrnmaps/
+.\" console screen maps
+.El
 .It Pa src/
 .Bx ,
 third-party, and/or local source files

Modified: head/share/man/man8/nanobsd.8
==============================================================================
--- head/share/man/man8/nanobsd.8	Tue Aug 26 06:31:52 2014	(r270646)
+++ head/share/man/man8/nanobsd.8	Tue Aug 26 08:13:30 2014	(r270647)
@@ -277,6 +277,8 @@ Disables
 .Xr getty 8
 on the virtual
 .Xr syscons 4
+or
+.Xr vt 4
 terminals
 .Pq Pa /dev/ttyv*
 and enables the use of the first serial port as the system
