From d088bd27ef9fac2695c9769b4fbb230e32d93b31 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 25 Oct 2011 12:47:26 -0400 Subject: If locale.conf exists, use it. (#706756, in part) systemd's algorithm on startup is: - if /etc/locale.conf is parseable, use that - otherwise, use /etc/sysconfig/i18n Given that we have a heirarchy of system -> user settings here, simply go: ~/.i18n > /etc/locale.conf > /etc/sysconfig/i18n Add some documentation as well. --- sysconfig.txt | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'sysconfig.txt') diff --git a/sysconfig.txt b/sysconfig.txt index 002c3be8..60cc84f4 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -431,9 +431,10 @@ Generic options: -q option is not given to sendmail if /etc/sysconfig/sendmail exists and QUEUE is empty or undefined. -/etc/sysconfig/i18n - If ~/.i18n exists, it is used in addition to /etc/sysconfig/i18n and allows - per-user customization of the locales. +/etc/locale.conf + + A configutration file for locale settings. See locale.conf(5) for + more details. LANG= set locale for all categories, can be any two letter ISO language code @@ -451,6 +452,14 @@ Generic options: The above variables are used in /etc/profile.d/lang.sh. + This data will be also be read from the legacy /etc/sysconfig/i18n + location, but /etc/locale.conf takes precedence. + + If ~/.i18n exists, it is used in addition to /etc/locale.conf and + /etc/sysconfig/i18n for per-user customization of the locales. + +/etc/vconsole.conf: + SYSFONT= Console font. Fonts are found in /lib/kbd/consolefonts. UNIMAP= Unicode font map. Most fonts have these built-in. Font maps @@ -460,8 +469,9 @@ Generic options: SYSFONTACM= Console map. These are applied via setfont's -m option, and are found in /lib/kbd/consoletrans. - The above are used by the /sbin/setsysfont command (which is run - by rc.sysinit at boot time.) For more information, see setfont(8). + The above are used to set up the keyboard at boot time. For more + information, see vconsole.conf(5). If this file does not exist, + values will be read from /etc/sysconfig/i18n. Files in /etc/sysconfig/network-scripts/ ======================================== -- cgit v1.2.1