SOURCES: console.sh - kill subshell, always source /etc/sysconfig/...

[radek]

Author: radek                        Date: Tue May 23 13:25:57 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- kill subshell, always source /etc/sysconfig/i18n

---- Files affected:
SOURCES:
   console.sh (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/console.sh
diff -u SOURCES/console.sh:1.12 SOURCES/console.sh:1.13
--- SOURCES/console.sh:1.12	Mon Sep 19 01:38:52 2005
+++ SOURCES/console.sh	Tue May 23 15:25:52 2006
@@ -1,10 +1,12 @@
-if (tty -s); then
+[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
+
+tty -s
+if [ $? -eq 0 ]; then
  case $TERM in
   linux)
  	if [ -f /etc/sysconfig/console ]; then
 		. /etc/sysconfig/console
 
-		[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
 		case "$LANG" in
 			*.utf8|*.UTF-8)
 				[ -x /bin/unicode_start ] && /sbin/consoletype fg && /bin/unicode_start
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/console.sh?r1=1.12&r2=1.13&f=u