mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 18:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

man: move description of kernel vconsole.conf overrides to vconsole.conf(5)

Browse Source 
They were outdated, and this way it's less likely that they'll get out of sync
again. Anyway, it's easier for the reader to have the kernel and config file
options next to one another.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-07-29 01:01:04 -04:00
parent aaa709bbaa
commit 72ccee50d0
3 changed files with 36 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
man/kernel-command-line.xml
View File

@ -224,15 +224,14 @@
<varlistentry>
<term><varname>vconsole.keymap=</varname></term>
<term><varname>vconsole.keymap.toggle=</varname></term>
<term><varname>vconsole.keymap_toggle=</varname></term>
<term><varname>vconsole.font=</varname></term>
<term><varname>vconsole.font.map=</varname></term>
<term><varname>vconsole.font.unimap=</varname></term>
<term><varname>vconsole.font_map=</varname></term>
<term><varname>vconsole.font_unimap=</varname></term>
<listitem>
<para>Parameters understood by the virtual console setup
logic. For details, see
<citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
<para>Parameters understood by the virtual console setup logic. For details, see
<citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
</listitem>
</varlistentry>

36
man/systemd-vconsole-setup.service.xml
View File

@ -63,41 +63,7 @@
<para>See
<citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for information about the configuration files understood by this
service.</para>
</refsect1>
<refsect1>
<title>Kernel Command Line</title>
<para>A few configuration parameters from
<filename>vconsole.conf</filename> may be overridden on the kernel
command line:</para>
<variablelist class='kernel-commandline-options'>
<varlistentry>
<term><varname>vconsole.keymap=</varname></term>
<term><varname>vconsole.keymap.toggle=</varname></term>
<listitem><para>Overrides the key mapping table for the
keyboard and the second toggle keymap.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>vconsole.font=</varname></term>
<term><varname>vconsole.font.map=</varname></term>
<term><varname>vconsole.font.unimap=</varname></term>
<listitem><para>Configures the console font, the console map,
and the unicode font map.</para></listitem>
</varlistentry>
</variablelist>
<para>See
<citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for information about these settings.</para>
for information about the configuration files and kernel command line options understood by this program.</para>
</refsect1>
<refsect1>

38
man/vconsole.conf.xml
View File

@ -57,8 +57,6 @@
the virtual console, i.e. keyboard mapping and console font. It is
applied at boot by udev using <filename>90-vconsole.rules</filename> file.
You can safely mask this file if you want to avoid this kind of initialization.
There is also <citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
provided that you can conveniently use at any time to [re]initialize consoles.
</para>
<para>The basic file format of the
@ -93,12 +91,10 @@
<term><varname>KEYMAP=</varname></term>
<term><varname>KEYMAP_TOGGLE=</varname></term>
<listitem><para>Configures the key mapping table for the
keyboard. <varname>KEYMAP=</varname> defaults to
<literal>us</literal> if not set. The
<varname>KEYMAP_TOGGLE=</varname> can be used to configure a
second toggle keymap and is by default
unset.</para></listitem>
<listitem><para>Configures the key mapping table for the keyboard.
<varname>KEYMAP=</varname> defaults to <literal>us</literal> if not set. The
<varname>KEYMAP_TOGGLE=</varname> can be used to configure a second toggle keymap and is by
default unset.</para></listitem>
</varlistentry>
<varlistentry>
@ -113,6 +109,32 @@
</variablelist>
</refsect1>
<refsect1>
<title>Kernel Command Line</title>
<para>A few configuration parameters from <filename>vconsole.conf</filename> may be overridden
on the kernel command line:</para>
<variablelist class='kernel-commandline-options'>
<varlistentry>
<term><varname>vconsole.keymap=</varname></term>
<term><varname>vconsole.keymap_toggle=</varname></term>
<listitem><para>Overrides <varname>KEYMAP=</varname> and <varname>KEYMAP_TOGGLE=</varname>.
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>vconsole.font=</varname></term>
<term><varname>vconsole.font_map=</varname></term>
<term><varname>vconsole.font_unimap=</varname></term>
<listitem><para>Overrides <varname>FONT=</varname>, <varname>FONT_MAP=</varname>, and
<varname>FONT_UNIMAP=</varname>.</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>Example</title>