summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2013-05-05 13:47:45 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2013-05-05 13:47:45 -0500
commit248434329b8ffd56b02bd13629a780bfae86f9ce (patch)
tree9b0ebb744d38d7e364513c11470df14b2d97f8c6
parenta09a60c4cf6e390fc4c2964c4a7a3674214283ee (diff)
downloadopenrc-248434329b8ffd56b02bd13629a780bfae86f9ce.tar.gz
openrc-248434329b8ffd56b02bd13629a780bfae86f9ce.tar.bz2
openrc-248434329b8ffd56b02bd13629a780bfae86f9ce.tar.xz
fix setfont detection in early startup on Linux
Most of the time, setfont is an external command (part of the kbd package), but it can also be a builtin if busybox is being used. This corrects the test in early startup to work for both cases. I would like to thank Steve L. for pointing this out.
-rw-r--r--sh/init-early.sh.Linux.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in
index ba1da98..9270e7f 100644
--- a/sh/init-early.sh.Linux.in
+++ b/sh/init-early.sh.Linux.in
@@ -30,7 +30,8 @@ fi
if service_present "$RC_DEFAULTLEVEL" consolefont ||
service_present "$RC_BOOTLEVEL" consolefont; then
printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null
- if [ -r "$RC_LIBEXECDIR"/console/font -a -x /usr/bin/setfont ]; then
+ if [ -r "$RC_LIBEXECDIR"/console/font ] && \
+ type setfont > /dev/null 2>&1; then
[ -c "$CONSOLE" ] && cons="-C $CONSOLE"
setfont $cons "$RC_LIBEXECDIR"/console/font 2>/dev/null
fi