aboutsummaryrefslogtreecommitdiff
path: root/sh/init-early.sh.Linux.in
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-05-29 14:15:12 +0100
committerRoy Marples <roy@marples.name>2009-05-29 14:15:12 +0100
commit83e82c452e89bf27de2a7b01bc2356c9050b2a18 (patch)
treea4f8843c7c02a6b51abb06a16f0a9a6665facc71 /sh/init-early.sh.Linux.in
parent9c5faf231ccf50695270034ab63f747fa2bef1d7 (diff)
parenta518d34549fd80268e9c70d2300808b63c54825c (diff)
Merge branch 'master' of ssh://roy.marples.name/var/git/openrc
Diffstat (limited to 'sh/init-early.sh.Linux.in')
-rw-r--r--sh/init-early.sh.Linux.in13
1 files changed, 7 insertions, 6 deletions
diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in
index a533d52b..e13af131 100644
--- a/sh/init-early.sh.Linux.in
+++ b/sh/init-early.sh.Linux.in
@@ -3,8 +3,9 @@
# All rights reserved. Released under the 2-clause BSD license.
: ${CONSOLE:=/dev/console}
+: ${RC_LIBEXECDIR:=@LIBEXECDIR@}
-if [ -e "$RC_LIBDIR"/console/unicode ]; then
+if [ -e "$RC_LIBEXECDIR"/console/unicode ]; then
termencoding="%G"
kmode="-u"
else
@@ -16,10 +17,10 @@ fi
if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/consolefont \
-o -e /etc/runlevels/"$RC_BOOTLEVEL"/consolefont ]; then
printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null
- if [ -r "$RC_LIBDIR"/console/font -a -x /bin/setfont ]; then
- font="$(cat "$RC_LIBDIR"/console/font)"
+ if [ -r "$RC_LIBEXECDIR"/console/font -a -x /bin/setfont ]; then
+ font="$(cat "$RC_LIBEXECDIR"/console/font)"
[ -c "$CONSOLE" ] && cons="-C $CONSOLE"
- setfont $cons "$RC_LIBDIR"/console/"$font" 2>/dev/null
+ setfont $cons "$RC_LIBEXECDIR"/console/"$font" 2>/dev/null
fi
fi
@@ -27,8 +28,8 @@ fi
if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/keymaps \
-o -e /etc/runlevels/"$RC_BOOTLEVEL"/keymaps ]; then
kbd_mode $kmode -C "$CONSOLE" 2>/dev/null
- if [ -r "$RC_LIBDIR"/console/keymap ]; then
- loadkeys "$RC_LIBDIR"/console/keymap 2>/dev/null
+ if [ -r "$RC_LIBEXECDIR"/console/keymap ]; then
+ loadkeys "$RC_LIBEXECDIR"/console/keymap 2>/dev/null
fi
fi