diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-10-25 12:47:26 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2011-10-25 12:47:26 -0400 |
| commit | d088bd27ef9fac2695c9769b4fbb230e32d93b31 (patch) | |
| tree | 75b7b165f06bdef14e63cdb4f7831d948db60b17 /rc.d | |
| parent | 05d7d8b6ee43103a589c8a999d5d96bdcd06f519 (diff) | |
| download | initscripts-d088bd27ef9fac2695c9769b4fbb230e32d93b31.tar initscripts-d088bd27ef9fac2695c9769b4fbb230e32d93b31.tar.gz initscripts-d088bd27ef9fac2695c9769b4fbb230e32d93b31.tar.bz2 initscripts-d088bd27ef9fac2695c9769b4fbb230e32d93b31.tar.xz initscripts-d088bd27ef9fac2695c9769b4fbb230e32d93b31.zip | |
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.
Diffstat (limited to 'rc.d')
| -rw-r--r-- | rc.d/init.d/functions | 2 | ||||
| -rwxr-xr-x | rc.d/rc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index e313e35b..1437b252 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -61,7 +61,7 @@ if [ -z "${CONSOLETYPE:-}" ]; then fi fi -if [ -z "${NOLOCALE:-}" ] && [ -z "${LANGSH_SOURCED:-}" ] && [ -f /etc/sysconfig/i18n ] ; then +if [ -z "${NOLOCALE:-}" ] && [ -z "${LANGSH_SOURCED:-}" ] && [ -f /etc/sysconfig/i18n -o -f /etc/locale.conf ] ; then . /etc/profile.d/lang.sh 2>/dev/null # avoid propagating LANGSH_SOURCED any further unset LANGSH_SOURCED @@ -51,7 +51,7 @@ fi # Set language, vc settings once to avoid doing it for every init script # through functions -if [ -z "${NOLOCALE:-}" ] && [ -f /etc/sysconfig/i18n ] ; then +if [ -z "${NOLOCALE:-}" ] && [ -f /etc/sysconfig/i18n -o -f /etc/locale.conf ] ; then . /etc/profile.d/lang.sh 2>/dev/null export LANGSH_SOURCED=1 fi |