From 248434329b8ffd56b02bd13629a780bfae86f9ce Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sun, 5 May 2013 13:47:45 -0500 Subject: 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. --- sh/init-early.sh.Linux.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3