summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2011-12-31 01:06:01 +0100
committerTom Gundersen <teg@jklm.no>2011-12-31 01:08:11 +0100
commitf26c97b536b0d4d3462cac5fac7d0aff513a4267 (patch)
tree948ff637d52e714a5a451a1394f4e0c37a62754a
parentb132946541e0a49d1168d5e2f65999cc8151a8de (diff)
man: add Arch-specific man page for locale.conf and vconsole.conf
Taken from systemd, but adapted to be Arch-specific. Some things left commented out as we might want to implement them. Signed-off-by: Tom Gundersen <teg@jklm.no>
-rw-r--r--.gitignore2
-rw-r--r--Makefile12
-rw-r--r--locale.conf.5.txt40
-rw-r--r--vconsole.conf.5.txt61
4 files changed, 112 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 6fead58..7b4ecc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
tags
*.tar.xz*
+locale.conf.5
+vconsole.conf.5
rc.conf.5
rc.d.8
pkg/
diff --git a/Makefile b/Makefile
index d7dc3f0..4570a54 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ install: installdirs doc
install -m755 -t $(DESTDIR)/etc/profile.d locale.sh
install -m755 -t $(DESTDIR)/usr/sbin rc.d
install -m644 -t ${DESTDIR}/usr/share/man/man8 rc.d.8
- install -m644 -t ${DESTDIR}/usr/share/man/man5 rc.conf.5
+ install -m644 -t ${DESTDIR}/usr/share/man/man5 rc.conf.5 locale.conf vconsole.conf
install -m755 -t $(DESTDIR)/usr/lib/initscripts arch-tmpfiles arch-sysctl
install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/arch.conf
install -m644 -T bash-completion $(DESTDIR)/etc/bash_completion.d/rc.d
@@ -41,10 +41,16 @@ rc.d.8: rc.d.8.txt
rc.conf.5: rc.conf.5.txt
a2x -d manpage -f manpage rc.conf.5.txt
-doc: rc.d.8 rc.conf.5
+locale.conf.5: locale.conf.5.txt
+ a2x -d manpage -f manpage locale.conf.5.txt
+
+vconsole.conf.5: vconsole.conf.5.txt
+ a2x -d manpage -f manpage vconsole.conf.5.txt
+
+doc: rc.d.8 rc.conf.5 locale.conf.5 vconsole.conf.5
clean:
- rm -f rc.d.8 rc.conf.5
+ rm -f rc.d.8 rc.conf.5 locale.conf.5 vconsole.conf.5
tar:
git archive HEAD --prefix=initscripts-$(VER)/ | xz > initscripts-$(VER).tar.xz
diff --git a/locale.conf.5.txt b/locale.conf.5.txt
new file mode 100644
index 0000000..8d510fa
--- /dev/null
+++ b/locale.conf.5.txt
@@ -0,0 +1,40 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet:
+/////
+locale.conf(5)
+==============
+
+NAME
+----
+locale.conf - configuration file for locale settings
+
+SYNOPSIS
+--------
+*/etc/locale.conf*
+
+DESCRIPTION
+-----------
+The /etc/locale.conf file configures system-wide locale settings.
+
+The basic file format of locale.conf is a newline-separated list of environment-like shell-compatible variable assignments. It is
+possible to source the configuration from shell scripts, however, beyond mere variable assignments no shell features are supported,
+allowing applications to read the file without implementing a shell compatible execution engine.
+
+The locale settings configured in /etc/locale.conf are system-wide and are inherited by every service or user, unless overridden or
+unset by individual programs or individual users. To avoid services inheriting the locale settings on sysvinit systems, the
+DAEMON_LOCALE variable in rc.conf can be set to "no".
+
+In Arch /etc/rc.conf is also checked for locale configuration as well, however only as fallback.
+
+OPTIONS
+-------
+The following locale settings may be set using /etc/locale.conf: *LANG=*, *LANGUAGE=*, *LC_CTYPE=*, *LC_NUMERIC=*, *LC_TIME=*, *LC_COLLATE=*,
+*LC_MONETARY=*, *LC_MESSAGES=*, *LC_PAPER=*, *LC_NAME=*, *LC_ADDRESS=*, *LC_TELEPHONE=*, *LC_MEASUREMENT=*, *LC_IDENTIFICATION=*. Note that *LC_ALL* may not be be configured in this file. For details about the meaning and semantics of these settings, refer to locale(7).
+
+SEE ALSO
+--------
+systemd.locale.conf(5), locale(7), rc.conf(5)
+
+AUTHORS
+-------
+Original by Lennart Poettering, adapted to Arch Linux by Tom Gundersen.
diff --git a/vconsole.conf.5.txt b/vconsole.conf.5.txt
new file mode 100644
index 0000000..956ca6a
--- /dev/null
+++ b/vconsole.conf.5.txt
@@ -0,0 +1,61 @@
+/////
+vim:set ts=4 sw=4 syntax=asciidoc noet:
+/////
+vconsole.conf(5)
+================
+
+NAME
+----
+vconsole.conf - configuration file for the virtual console
+
+SYNOPSIS
+--------
+*/etc/vconsole.conf*
+
+DESCRIPTION
+-----------
+
+The /etc/vconsole.conf file configures the virtual console, i.e. keyboard mapping and console font.
+
+The basic file format of the vconsole.conf is a newline-separated list environment-like shell-compatible variable assignments. It is
+possible to source the configuration from shell scripts, however, beyond mere variable assignments no shell features are supported,
+allowing applications to read the file without implementing a shell compatible execution engine.
+
+In Arch /etc/rc.conf is also checked for vconsole configuration as well, however only as fallback, as described below.
+
+OPTIONS
+-------
+
+The following options are understood:
+
+*KEYMAP=*
+//, KEYMAP_TOGGLE=
+//The KEYMAP_TOGGLE= can be used to configured a second toggle keymap and is by default unset.
+// KEYMAP= defaults to us if not set.
+
+ Configures the key mapping table of for they keyboard. Overriding KEYMAP from rc.conf.
+
+*FONT=*, *FONT_MAP=*
+//, FONT_UNIMAP=
+// the unicode font map
+// FONT= defaults to latarcyrheb-sun16.
+
+ Configures the console font and the console map. Overriding respectively CONSOLEFONT and CONSOLEMAP from rc.conf.
+
+EXAMPLE
+-------
+*Example 1. German keyboard and console*
+
+/etc/vconsole.conf:
+
+ KEYMAP=de-latin1
+ FONT=latarcyrheb-sun16
+
+SEE ALSO
+--------
+
+systemd.vconsole.conf(5), loadkeys(1), setfont(8), rc.conf(5)
+
+AUTHORS
+-------
+Original by Lennart Poettering, adapted to Arch Linux by Tom Gundersen.