aboutsummaryrefslogtreecommitdiffstats
path: root/lang.sh
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-10-25 12:47:26 -0400
committerBill Nottingham <notting@redhat.com>2011-10-25 12:47:26 -0400
commitd088bd27ef9fac2695c9769b4fbb230e32d93b31 (patch)
tree75b7b165f06bdef14e63cdb4f7831d948db60b17 /lang.sh
parent05d7d8b6ee43103a589c8a999d5d96bdcd06f519 (diff)
downloadinitscripts-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 'lang.sh')
-rwxr-xr-xlang.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/lang.sh b/lang.sh
index 5be62ad8..9ad5e847 100755
--- a/lang.sh
+++ b/lang.sh
@@ -8,7 +8,7 @@ if [ -n "$LANG" ]; then
LANG="$saved_lang"
unset saved_lang
else
- for langfile in /etc/sysconfig/i18n "$HOME/.i18n" ; do
+ for langfile in /etc/sysconfig/i18n /etc/locale.conf "$HOME/.i18n" ; do
[ -f $langfile ] && . $langfile && sourced=1
done
fi