aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-02-26 01:34:52 -0500
committerBill Nottingham <notting@redhat.com>2008-02-26 01:34:52 -0500
commit39ae04ec465e4a921ef8fe80ec52587e5a7ae627 (patch)
treecf3652991f856f0a80e277f3bac9dddaaa6325b6
parent1aed7b771e4b0d61ec2cabdfb267de043eb8cb9f (diff)
downloadinitscripts-39ae04ec465e4a921ef8fe80ec52587e5a7ae627.tar
initscripts-39ae04ec465e4a921ef8fe80ec52587e5a7ae627.tar.gz
initscripts-39ae04ec465e4a921ef8fe80ec52587e5a7ae627.tar.bz2
initscripts-39ae04ec465e4a921ef8fe80ec52587e5a7ae627.tar.xz
initscripts-39ae04ec465e4a921ef8fe80ec52587e5a7ae627.zip
Remove bits that are now extraneous with console_init.
-rwxr-xr-xlang.csh54
-rwxr-xr-xlang.sh24
-rwxr-xr-xrc.d/rc.sysinit33
3 files changed, 0 insertions, 111 deletions
diff --git a/lang.csh b/lang.csh
index 624a3c68..5757088c 100755
--- a/lang.csh
+++ b/lang.csh
@@ -32,44 +32,6 @@ if ($sourced == 1) then
set consoletype=`/sbin/consoletype`
- if ($?CHARSET) then
- switch ($CHARSET)
- case 8859-1:
- case 8859-2:
- case 8859-5:
- case 8859-8:
- case 8859-15:
- case koi*:
- case latin2*:
- if ( $?TERM ) then
- if ( "$TERM" == "linux" ) then
- if ( "$consoletype" == "vt" ) then
- /bin/echo -n -e '\033(K' >/dev/tty
- endif
- endif
- endif
- breaksw
- endsw
- endif
- if ($?SYSFONTACM) then
- switch ($SYSFONTACM)
- case iso01*:
- case iso02*:
- case iso05*:
- case iso08*:
- case iso15*:
- case koi*:
- case latin2-ucw*:
- if ( $?TERM ) then
- if ( "$TERM" == "linux" ) then
- if ( "$consoletype" == "vt" ) then
- /bin/echo -n -e '\033(K' > /dev/tty
- endif
- endif
- endif
- breaksw
- endsw
- endif
if ($?LANG) then
switch ($LANG)
case *.utf8*:
@@ -88,17 +50,6 @@ if ($sourced == 1) then
setenv LANG en_US.UTF-8
breaksw
endsw
- if ( -x /bin/unicode_start ) then
- if { /sbin/consoletype fg } then
- if ( $?SYSFONT ) then
- if ( $?SYSFONTACM ) then
- unicode_start $SYSFONT $SYSFONTACM
- else
- unicode_start $SYSFONT
- endif
- endif
- endif
- endif
endif
endif
endif
@@ -118,11 +69,6 @@ if ($sourced == 1) then
setenv LANG en_US
breaksw
endsw
- if ( -x /bin/unicode_stop ) then
- if { /sbin/consoletype fg } then
- /bin/unicode_stop
- endif
- endif
endif
endif
endif
diff --git a/lang.sh b/lang.sh
index f4860867..3e485a22 100755
--- a/lang.sh
+++ b/lang.sh
@@ -48,34 +48,11 @@ if [ "$sourced" = 1 ]; then
consoletype=$(/sbin/consoletype)
- if [ -n "$CHARSET" ]; then
- case $CHARSET in
- 8859-1|8859-2|8859-5|8859-8|8859-15|koi*)
- if [ "$TERM" = "linux" -a "$consoletype" = "vt" ]; then
- echo -n -e '\033(K' 2>/dev/null > /proc/$$/fd/0
- fi
- ;;
- esac
- elif [ -n "$SYSFONTACM" ]; then
- case $SYSFONTACM in
- iso01*|iso02*|iso05*|iso08*|iso15*|koi*|latin2-ucw*)
- if [ "$TERM" = "linux" -a "$consoletype" = "vt" ]; then
- echo -n -e '\033(K' 2>/dev/null > /proc/$$/fd/0
- fi
- ;;
- esac
- fi
if [ -n "$LANG" ]; then
case $LANG in
*.utf8*|*.UTF-8*)
if [ "$TERM" = "linux" ]; then
if [ "$consoletype" = "vt" ]; then
- if [ -x /bin/unicode_start ] && /sbin/consoletype fg ; then
- for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do
- [ -f $langfile ] && . $langfile
- done
- /bin/unicode_start $SYSFONT $SYSFONTACM
- fi
case $LANG in
ja*) LANG=en_US.UTF-8 ;;
ko*) LANG=en_US.UTF-8 ;;
@@ -98,7 +75,6 @@ if [ "$sourced" = 1 ]; then
en_IN*) ;;
*_IN*) LANG=en_US ;;
esac
- [ -x /bin/unicode_stop ] && /sbin/consoletype fg && /bin/unicode_stop
fi
fi
;;
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index ee0c5575..0f0a238b 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -229,10 +229,6 @@ init_crypto() {
return $ret
}
-if [ -x /sbin/setsysfont -a -c /dev/tty1 ]; then
- /sbin/setsysfont < /dev/tty1 > /dev/tty1 2>/dev/null
-fi
-
# Print a text banner.
echo -en $"\t\tWelcome to "
read -r redhat_release < /etc/redhat-release
@@ -318,35 +314,6 @@ fi
update_boot_stage RCkernelparam
sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
-if [ -x /bin/loadkeys ]; then
- KEYTABLE=
- KEYMAP=
- if [ -f /etc/sysconfig/console/default.kmap ]; then
- KEYMAP=/etc/sysconfig/console/default.kmap
- else
- if [ -f /etc/sysconfig/keyboard ]; then
- . /etc/sysconfig/keyboard
- fi
- if [ -n "$KEYTABLE" -a -d "/lib/kbd/keymaps" ]; then
- KEYMAP="$KEYTABLE.map"
- fi
- fi
- if [ -n "$KEYMAP" ]; then
- if [ -n "$KEYTABLE" ]; then
- echo -n $"Loading default keymap ($KEYTABLE): "
- else
- echo -n $"Loading default keymap: "
- fi
- LOADKEYS=loadkeys
- if [ "${LANG}" != "${LANG%%.UTF-8}" -o "${LANG}" != "${LANG%%.utf8}" ]; then
- LOADKEYS="loadkeys -u"
- fi
- $LOADKEYS $KEYMAP < /dev/tty0 > /dev/tty0 2>/dev/null && \
- success $"Loading default keymap" || failure $"Loading default keymap"
- echo
- fi
-fi
-
# Set the hostname.
update_boot_stage RChostname
action $"Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME}