From c3f014d2be64f0fb4d9a5e4f14a65a6599dd8002 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 26 Oct 2006 20:57:48 +0000
Subject: fix or_IN and similar locales (#212219)

---
 rc.d/init.d/functions | 16 +---------------
 rc.d/rc.sysinit       |  8 ++++----
 2 files changed, 5 insertions(+), 19 deletions(-)

(limited to 'rc.d')

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 4c4fdd97..580216d1 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -19,21 +19,7 @@ export PATH
 [ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="`/sbin/consoletype`"
 
 if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" ] ; then
-  . /etc/sysconfig/i18n
-  if [ "$CONSOLETYPE" != "pty" ]; then
-	case "${LANG:-}" in
-		ja_JP*|ko_KR*|zh_CN*|zh_TW*|bn_*|bd_*|pa_*|hi_*|ta_*|gu_*)
-			export LC_MESSAGES=en_US
-			export LANG
-			;;
-		*)
-			export LANG
-			;;
-	esac
-  else
-  	[ -n "${LC_MESSAGES:-}" ] && export LC_MESSAGES
-	export LANG
-  fi
+  . /etc/profile.d/lang.sh
 fi
 
 # Read in our configuration
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index f9e70add..fae42e55 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -348,8 +348,8 @@ RHGB_STARTED=0
 mount -n /dev/pts >/dev/null 2>&1
 [ -n "$SELINUX_STATE" ] && restorecon /dev/pts >/dev/null 2>&1
 
-if strstr "$cmdline" rhgb && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
-   LC_MESSAGES= /usr/bin/rhgb
+if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
+   ( . /etc/sysconfig/i18n 2>/dev/null ; /usr/bin/rhgb )
    RHGB_STARTED=1
 fi
 
@@ -757,8 +757,8 @@ fi
 
 
 # Start the graphical boot, if necessary and not done yet.
-if strstr "$cmdline" rhgb && [ "$RHGB_STARTED" -eq 0 -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
-   LC_MESSAGES= /usr/bin/rhgb
+if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ "$RHGB_STARTED" -eq 0 -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
+   ( . /etc/sysconfig/i18n 2>/dev/null ; /usr/bin/rhgb )
    RHGB_STARTED=1
 fi
 
-- 
cgit v1.2.1