File git-21-52d873754994b203d26a4268993599716607c082.patch of Package aaa_base.4819
commit 52d873754994b203d26a4268993599716607c082
Author: Werner Fink <werner@suse.de>
Date: Mon May 2 09:38:16 2016 +0200
lang.sh, lang.csh: allow GDM to override locale
Signed-off-by: Werner Fink <werner@suse.de>
diff --git a/files/etc/profile.d/lang.csh b/files/etc/profile.d/lang.csh
index 0524d40..86e8472 100644
--- a/files/etc/profile.d/lang.csh
+++ b/files/etc/profile.d/lang.csh
@@ -28,7 +28,8 @@ endif
# Get the system and after that the users configuration
#
if ( -s /etc/sysconfig/language ) then
- if ( ${?LANG} ) then
+ # Allow GDM to override system settings
+ if ( ${?GDM_LANG} ) then
if ( "$uid" == 0 ) then
eval `sed -rn -e 's/^(ROOT_USES_LANG)=/set \1=/p' < /etc/sysconfig/language`
else
diff --git a/files/etc/profile.d/lang.sh b/files/etc/profile.d/lang.sh
index 4a9c372..ae7f160 100644
--- a/files/etc/profile.d/lang.sh
+++ b/files/etc/profile.d/lang.sh
@@ -30,7 +30,8 @@ if test -s /etc/sysconfig/language ; then
continue
;;
RC_*)
- test -n "$LANG" && continue
+ # Allow GDM to override system settings
+ test -n "$GDM_LANG" && continue
eval ${line#RC_}
;;
ROOT_USES_LANG*)