diff options
| author | Bill Nottingham <notting@redhat.com> | 2006-10-26 21:00:16 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2006-10-26 21:00:16 +0000 |
| commit | 776145695f6fe3cb7abd7c8bc5c960418e2af403 (patch) | |
| tree | 723db77b97e3d8c6a1700c2331fbd34919d80e08 | |
| parent | 02a4fbf8c653dda3f96cc891c52785cb32878366 (diff) | |
| download | initscripts-776145695f6fe3cb7abd7c8bc5c960418e2af403.tar initscripts-776145695f6fe3cb7abd7c8bc5c960418e2af403.tar.gz initscripts-776145695f6fe3cb7abd7c8bc5c960418e2af403.tar.bz2 initscripts-776145695f6fe3cb7abd7c8bc5c960418e2af403.tar.xz initscripts-776145695f6fe3cb7abd7c8bc5c960418e2af403.zip | |
fix or_IN and similar locales (#212438)
| -rwxr-xr-x | rc.d/init.d/functions | 16 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 8 |
2 files changed, 5 insertions, 19 deletions
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 e535aecf..60e034c1 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 @@ -741,8 +741,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 |