From 760baa8339c445c9f6d0afe0298d7312628b15a5 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 11 Dec 2000 23:08:21 +0000
Subject: don't try and load fonts and keymaps on a serial console. Duh.

---
 rc.d/rc.sysinit | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'rc.d')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index daba96dd..ba8943e0 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -103,8 +103,9 @@ esac
 
 action "Setting clock $CLOCKDEF: `date`" date
 
-# Load keymap
-if [ -x /bin/loadkeys ]; then
+if [ "'/sbin/consoletype'" == "vt" ]; then
+ # Load keymap
+ if [ -x /bin/loadkeys ]; then
  KEYTABLE=
  KEYMAP=
  if [ -f /etc/sysconfig/console/default.kmap ]; then
@@ -128,10 +129,10 @@ if [ -x /bin/loadkeys ]; then
      success "Loading default keymap" || failure "Loading default keymap"
   echo
  fi   
-fi
+ fi
 
-# Load system font
-if [ -x /sbin/setsysfont ]; then
+ # Load system font
+ if [ -x /sbin/setsysfont ]; then
     [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
     if [ -f /etc/sysconfig/console/$SYSFONT.psf.gz -o \
          -f /usr/lib/kbd/consolefonts/$SYSFONT.psf.gz -o \
@@ -139,6 +140,7 @@ if [ -x /sbin/setsysfont ]; then
          -f /usr/lib/kbd/consolefonts/$SYSFONT.gz ]; then
        action "Setting default font ($SYSFONT): " /sbin/setsysfont
     fi
+ fi
 fi
 
 # Start up swapping.
-- 
cgit v1.2.1