aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2002-06-28 03:29:59 +0000
committerBill Nottingham <notting@redhat.com>2002-06-28 03:29:59 +0000
commitdde0ed46d4e21ce254b764d9fad42162e9d4d14d (patch)
tree5197978f72d906919b598fc4453eb75780dd1434
parenta497b4549ece61690a4d931aa8fe2f5351a275d8 (diff)
downloadinitscripts-dde0ed46d4e21ce254b764d9fad42162e9d4d14d.tar
initscripts-dde0ed46d4e21ce254b764d9fad42162e9d4d14d.tar.gz
initscripts-dde0ed46d4e21ce254b764d9fad42162e9d4d14d.tar.bz2
initscripts-dde0ed46d4e21ce254b764d9fad42162e9d4d14d.tar.xz
initscripts-dde0ed46d4e21ce254b764d9fad42162e9d4d14d.zip
deal only with current paths; also, look for psfu files
-rwxr-xr-xrc.d/rc.sysinit6
1 files changed, 3 insertions, 3 deletions
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