From 921b3f87ef3e2470fe27a9851add13c433bdee57 Mon Sep 17 00:00:00 2001 From: Yukihiro Nakai Date: Mon, 13 Aug 2001 22:36:52 +0000 Subject: Korean and Chinese fix --- initscripts.spec | 5 ++++- rc.d/init.d/functions | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index b829adea..a58df792 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 6.17 +Version: 6.18 License: GPL Group: System Environment/Base Release: 1 @@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/locale/*/LC_MESSAGES %changelog +- Mon Aug 13 2001 Yukihiro Nakai +- don't display Chinese Korean if we aren't on a pty + * Sat Aug 11 2001 Florian La Roche - adjust s390 patches to current sources diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 3b147f5b..bd368ee5 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -27,6 +27,12 @@ if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" ] ; then . /etc/sysconfig/i18n if [ "${LANG:-}" = "ja_JP.eucJP" -a "`/sbin/consoletype`" != "pty" ]; then unset LANG + elif [ "${LANG:-}" = "ko_KR.eucKR" -a "`/sbin/consoletype`" != "pty" ]; then + unset LANG + elif [ "${LANG:-}" = "zh_CN.GB2312" -a "`/sbin/consoletype`" != "pty" ]; then + unset LANG + elif [ "${LANG:-}" = "zh_TW.Big5" -a "`/sbin/consoletype`" != "pty" ]; then + unset LANG else export LANG fi -- cgit v1.2.1