aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYukihiro Nakai <ynakai@redhat.com>2001-08-13 22:36:52 +0000
committerYukihiro Nakai <ynakai@redhat.com>2001-08-13 22:36:52 +0000
commit921b3f87ef3e2470fe27a9851add13c433bdee57 (patch)
tree676899099c6c5bc99fe1d640c1d7e784e49fe756
parentecfab35bf3f7bb8e754b40de35d53c217e0f5a9f (diff)
downloadinitscripts-921b3f87ef3e2470fe27a9851add13c433bdee57.tar
initscripts-921b3f87ef3e2470fe27a9851add13c433bdee57.tar.gz
initscripts-921b3f87ef3e2470fe27a9851add13c433bdee57.tar.bz2
initscripts-921b3f87ef3e2470fe27a9851add13c433bdee57.tar.xz
initscripts-921b3f87ef3e2470fe27a9851add13c433bdee57.zip
Korean and Chinese fix
-rw-r--r--initscripts.spec5
-rwxr-xr-xrc.d/init.d/functions6
2 files changed, 10 insertions, 1 deletions
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 <ynakai@redhat.com>
+- don't display Chinese Korean if we aren't on a pty
+
* Sat Aug 11 2001 Florian La Roche <Florian.LaRoche@redhat.de>
- 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