From dde0ed46d4e21ce254b764d9fad42162e9d4d14d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 28 Jun 2002 03:29:59 +0000
Subject: deal only with current paths; also, look for psfu files

---
 rc.d/rc.sysinit | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'rc.d/rc.sysinit')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 7208cafb..119fc82d 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -120,7 +120,7 @@ if [ "`/sbin/consoletype`" = "vt" ]; then
   if [ -f /etc/sysconfig/keyboard ]; then
     . /etc/sysconfig/keyboard
   fi
-  if [ -n "$KEYTABLE" -a -d "/usr/lib/kbd/keymaps" -o -d "/lib/kbd/keymaps" ]; then
+  if [ -n "$KEYTABLE" -a -d "/lib/kbd/keymaps" ]; then
      KEYMAP=$KEYTABLE
   fi
  fi
@@ -141,10 +141,10 @@ if [ "`/sbin/consoletype`" = "vt" ]; then
  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 \
          -f /etc/sysconfig/console/$SYSFONT.gz -o \
-         -f /usr/lib/kbd/consolefonts/$SYSFONT.gz -o \
+         -f /etc/sysconfig/console/$SYSFONT.psfu.gz -o \
 	 -f /lib/kbd/consolefonts/$SYSFONT.gz -o \
+	 -f /lib/kbd/consolefonts/$SYSFONT.psfu.gz -o \
 	 -f /lib/kbd/consolefonts/$SYSFONT.psf.gz ]; then
        action $"Setting default font ($SYSFONT): " /sbin/setsysfont
     fi
-- 
cgit v1.2.1