aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-06-24 10:03:11 -0400
committerBill Nottingham <notting@redhat.com>2011-06-24 10:03:11 -0400
commit40e9f12f726fe72374172fae103673da7387ca98 (patch)
tree5373b65ff1debedde4b53aca30164e1fb56f4831
parent76e34e16d1a5acbb973a65f0fcdd0753b1276b4a (diff)
downloadinitscripts-40e9f12f726fe72374172fae103673da7387ca98.tar
initscripts-40e9f12f726fe72374172fae103673da7387ca98.tar.gz
initscripts-40e9f12f726fe72374172fae103673da7387ca98.tar.bz2
initscripts-40e9f12f726fe72374172fae103673da7387ca98.tar.xz
initscripts-40e9f12f726fe72374172fae103673da7387ca98.zip
Make sure we override LANG if we're being run from xinit/startx (#713988, <tatsu@ab.jp.nec.com>)
-rwxr-xr-xlang.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/lang.sh b/lang.sh
index cf02a619..bd798a15 100755
--- a/lang.sh
+++ b/lang.sh
@@ -2,7 +2,9 @@
sourced=0
-if [ -n "$LANG" ]; then
+# $sysxkbmap means we're running under Xinit; we want to re-read settings in case
+# we're running in CJKI and have been defaulted to English on the console.
+if [ -z "$sysxkbmap" -a -n "$LANG" ]; then
sourced=1
else
for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do