lang.{sh,csh} moved into setup package

  Other references to these files were removed, as well as irrelevant
  info in sysconfig.txt, and some dead code in init.d/functions file.

5 files changed, 3 insertions, 198 deletions

diff --git a/doc/sysconfig.txt b/doc/sysconfig.txt
index 1e8729ee..c0d14897 100644
--- a/doc/sysconfig.txt
+++ b/doc/sysconfig.txt
@@ -368,44 +368,6 @@ Generic options:
     -q option is not given to sendmail if /etc/sysconfig/sendmail
     exists and QUEUE is empty or undefined.
 
-/etc/locale.conf
-
-  A configutration file for locale settings. See locale.conf(5) for
-  more details. 
-
-  LANG= set locale for all categories, can be any two letter ISO
-    language code
-  LC_CTYPE= locale data configuration for classification and conversion
-    of characters
-  LC_COLLATE= locale data configuration for collation (sort order) of
-    strings
-  LC_MESSAGES= locale data configuration for translation of messages
-  LC_NUMERIC= locale data configuration for non-monetary numeric data
-  LC_MONETARY= locale data configuration for monetary data
-  LC_TIME= locale data configuration for date and time
-  LC_ALL= locale data configuration overriding all of the above
-  LANGUAGE= can be a : separated list of ISO language codes
-  LINGUAS= can be a ' ' separated list of ISO language codes
-
-  The above variables are used in /etc/profile.d/lang.sh.
-
-  If ~/.i18n exists, it is used in addition to /etc/locale.conf and
-  for per-user customization of the locales.
-
-/etc/vconsole.conf:
-
-  SYSFONT= Console font. Fonts are found in /lib/kbd/consolefonts.
-
-  UNIMAP= Unicode font map. Most fonts have these built-in. Font maps
-  can be found in /lib/kbd/unimaps. These are applied via setfont's
-  -u option.
- 
-  SYSFONTACM= Console map. These are applied via setfont's -m option,
-  and are found in /lib/kbd/consoletrans.
- 
-  The above are used to set up the keyboard at boot time. For more
-  information, see vconsole.conf(5).
-
 Files in /etc/sysconfig/network-scripts/
 ========================================
 
diff --git a/etc/profile.d/lang.csh b/etc/profile.d/lang.csh
deleted file mode 100644
index f6ec891d..00000000
--- a/etc/profile.d/lang.csh
+++ /dev/null
@@ -1,78 +0,0 @@
-# /etc/profile.d/lang.csh - exports environment variables, and provides fallback
-#                           for CJK languages that can't be displayed in console.
-
-if (${?LANG}) then
-    set LANG_backup=${LANG}
-endif
-
-foreach config (/etc/locale.conf "${HOME}/.i18n")
-    if (-f "${file}") then
-        # NOTE: We are using eval & sed here to avoid invoking of any commands & functions from those files.
-        eval `sed -r -e 's/^[[:blank:]]*([[:upper:]_]+)=([[:print:][:digit:]\._-]+|"[[:print:][:digit:]\._-]+")/setenv \1 \2;/;t;d' ${config}`
-    endif
-end
-
-if (${?LANG_backup}) then
-    set LANG="${LANG_backup}"
-endif
-
-unset LANG_backup config
-
-# ----------------------------------------------
-
-# The LC_ALL is not supposed to be set in /etc/locale.conf according to 'man 5 locale.conf'.
-# If it is set, then we we expect it is user's explicit override (most likely from ~/.i18n file).
-# See 'man 7 locale' for more info about LC_ALL.
-if (${?LC_ALL}) then
-    if (${LC_ALL} != ${LANG}) then
-        setenv LC_ALL
-    else
-        unsetenv LC_ALL
-    endif
-endif
-
-# The ${LANG} manipulation is necessary only in virtual terminal (a.k.a. console - /dev/tty*):
-set in_console=`tty | grep --quiet -e '/dev/tty'; echo $?`
-
-if (${?LANG} && ${TERM} == 'linux' && in_console == 0) then
-    set utf8_used=`echo ${LANG} | grep --quiet -E -i -e '^.+\.utf-?8$'; echo $?`
-
-    if (${utf8_used} == 0) then
-        switch (${LANG})
-            case en_IN*:
-                breaksw
-
-            case ja*:
-            case ko*:
-            case si*:
-            case zh*:
-            case ar*:
-            case fa*:
-            case he*:
-            case *_IN*:
-                setenv LANG en_US.UTF-8
-                breaksw
-        endsw
-    else
-        switch (${LANG})
-            case en_IN*:
-                breaksw
-            case ja*:
-            case ko*:
-            case si*:
-            case zh*:
-            m case ar*:
-            case fa*:
-            case he*:
-            case *_IN*:
-                setenv LANG en_US
-                breaksw
-        endsw
-    endif
-
-    # NOTE: We are not exporting the ${LANG} here again on purpose.
-    #       If user starts GUI session from console manually, then
-    #       the previously set LANG should be okay to use.
-endif
-
-unset in_console utf8_used
diff --git a/etc/profile.d/lang.sh b/etc/profile.d/lang.sh
deleted file mode 100644
index 0252b0fe..00000000
--- a/etc/profile.d/lang.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-# /etc/profile.d/lang.sh - exports environment variables, and provides fallback
-#                          for CJK languages that can't be displayed in console.
-
-if [ -n "${LANG}" ]; then
-    LANG_backup="${LANG}"
-fi
-
-for config in /etc/locale.conf "${HOME}/.i18n"; do
-    # NOTE: We are using eval & sed here to avoid invoking of any commands & functions from those files.
-    if [ -f "${config}" ]; then
-        eval $(sed -r -e 's/^[[:blank:]]*([[:upper:]_]+)=([[:print:][:digit:]\._-]+|"[[:print:][:digit:]\._-]+")/export \1=\2/;t;d' ${config})
-    fi
-done
-
-if [ -n "${LANG_backup}" ]; then
-    LANG="${LANG_backup}"
-fi
-
-unset LANG_backup config
-
-# ----------------------------------------------
-
-# The LC_ALL is not supposed to be set in /etc/locale.conf according to 'man 5 locale.conf'.
-# If it is set, then we we expect it is user's explicit override (most likely from ~/.i18n file).
-# See 'man 7 locale' for more info about LC_ALL.
-if [ -n "${LC_ALL}" ]; then
-    if [ "${LC_ALL}" != "${LANG}" ]; then
-        export LC_ALL
-    else
-        unset LC_ALL
-    fi
-fi
-
-# The ${LANG} manipulation is necessary only in virtual terminal (a.k.a. console - /dev/tty*):
-if [ -n "${LANG}" ] && [ "${TERM}" = 'linux' ] && tty | grep --quiet -e '/dev/tty'; then
-    if grep --quiet -E -i -e '^.+\.utf-?8$' <<< "${LANG}"; then
-        case ${LANG} in
-            ja*)    LANG=en_US.UTF-8 ;;
-            ko*)    LANG=en_US.UTF-8 ;;
-            si*)    LANG=en_US.UTF-8 ;;
-            zh*)    LANG=en_US.UTF-8 ;;
-            ar*)    LANG=en_US.UTF-8 ;;
-            fa*)    LANG=en_US.UTF-8 ;;
-            he*)    LANG=en_US.UTF-8 ;;
-            en_IN*) true             ;;
-            *_IN*)  LANG=en_US.UTF-8 ;;
-        esac
-    else
-        case ${LANG} in
-            ja*)    LANG=en_US ;;
-            ko*)    LANG=en_US ;;
-            si*)    LANG=en_US ;;
-            zh*)    LANG=en_US ;;
-            ar*)    LANG=en_US ;;
-            fa*)    LANG=en_US ;;
-            he*)    LANG=en_US ;;
-            en_IN*) true       ;;
-            *_IN*)  LANG=en_US ;;
-        esac
-    fi
-
-    # NOTE: We are not exporting the ${LANG} here again on purpose.
-    #       If user starts GUI session from console manually, then
-    #       the previously set LANG should be okay to use.
-fi
diff --git a/etc/rc.d/init.d/functions b/etc/rc.d/init.d/functions
index a8174751..dd6a3165 100644
--- a/etc/rc.d/init.d/functions
+++ b/etc/rc.d/init.d/functions
@@ -58,21 +58,6 @@ systemctl_redirect () {
 # Get a sane screen width
 [ -z "${COLUMNS:-}" ] && COLUMNS=80
 
-if [ -z "${CONSOLETYPE:-}" ]; then
-    if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then
-        CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
-    else
-        CONSOLETYPE="serial"
-    fi
-fi
-
-if [ -z "${NOLOCALE:-}" ] && [ -z "${LANGSH_SOURCED:-}" ] && \
-        [ -f /etc/sysconfig/i18n -o -f /etc/locale.conf ] ; then
-    . /etc/profile.d/lang.sh 2>/dev/null
-    # avoid propagating LANGSH_SOURCED any further
-    unset LANGSH_SOURCED
-fi
-
 # Read in our configuration
 if [ -z "${BOOTUP:-}" ]; then
     if [ -f /etc/sysconfig/init ]; then
@@ -98,7 +83,9 @@ if [ -z "${BOOTUP:-}" ]; then
         # Verbosity of logging:
         LOGLEVEL=1
     fi
-    if [ "$CONSOLETYPE" = "serial" ]; then
+
+    # NOTE: /dev/ttyS* is serial console.
+    if tty | grep --quiet -e '/dev/ttyS'; then
         BOOTUP=serial
         MOVE_TO_COL=
         SETCOLOR_SUCCESS=
diff --git a/initscripts.spec b/initscripts.spec
index 2734c808..09252c65 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -195,7 +195,6 @@ fi
 %ghost %config(noreplace, missingok) %verify(not md5 size mtime) %{_sysconfdir}/rc.d/rc.local
 
 %{_sysconfdir}/NetworkManager/dispatcher.d/00-netreport
-%{_sysconfdir}/profile.d/lang.*
 %{_sysconfdir}/rc.d/init.d/functions
 %{_sysconfdir}/rc.d/init.d/netconsole
 %{_sysconfdir}/rc.d/init.d/network