aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/rc.sysinit
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2000-08-07 05:29:06 +0000
committerBill Nottingham <notting@redhat.com>2000-08-07 05:29:06 +0000
commitce580633961bea5559024b0b44756ed895f22fdd (patch)
tree3a4a67e2a65bd11810d5a3dbe1092eb455973914 /rc.d/rc.sysinit
parented86c74d282036c22a83756ce526336f0b477a0c (diff)
downloadinitscripts-ce580633961bea5559024b0b44756ed895f22fdd.tar
initscripts-ce580633961bea5559024b0b44756ed895f22fdd.tar.gz
initscripts-ce580633961bea5559024b0b44756ed895f22fdd.tar.bz2
initscripts-ce580633961bea5559024b0b44756ed895f22fdd.tar.xz
initscripts-ce580633961bea5559024b0b44756ed895f22fdd.zip
remove console-tools requirement
Diffstat (limited to 'rc.d/rc.sysinit')
-rwxr-xr-xrc.d/rc.sysinit18
1 files changed, 9 insertions, 9 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 1ad6b175..5d6fa5ff 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -98,22 +98,21 @@ esac
action "Setting clock $CLOCKDEF: `date`" date
-
-
# Load keymap
-KEYTABLE=
-KEYMAP=
-if [ -f /etc/sysconfig/console/default.kmap ]; then
+if [ -x /bin/loadkeys ]; then
+ KEYTABLE=
+ KEYMAP=
+ if [ -f /etc/sysconfig/console/default.kmap ]; then
KEYMAP=/etc/sysconfig/console/default.kmap
-else
+ else
if [ -f /etc/sysconfig/keyboard ]; then
. /etc/sysconfig/keyboard
fi
if [ -n "$KEYTABLE" -a -d "/usr/lib/kbd/keymaps" ]; then
KEYMAP=$KEYTABLE
fi
-fi
-if [ -n "$KEYMAP" ]; then
+ fi
+ if [ -n "$KEYMAP" ]; then
# Since this takes in/output from stdin/out, we can't use initlog
if [ -n "$KEYTABLE" ]; then
echo -n "Loading default keymap ($KEYTABLE): "
@@ -123,7 +122,8 @@ if [ -n "$KEYMAP" ]; then
loadkeys $KEYMAP < /dev/tty0 > /dev/tty0 2>/dev/null && \
success "Loading default keymap" || failure "Loading default keymap"
echo
-fi
+ fi
+fi
# Load system font
if [ -x /sbin/setsysfont ]; then