From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 314581381F3 for ; Sun, 5 May 2013 19:29:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3BA4E08E8; Sun, 5 May 2013 19:29:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 924D4E08E8 for ; Sun, 5 May 2013 19:29:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 828C633DEEC for ; Sun, 5 May 2013 19:29:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 21D68E4BC8 for ; Sun, 5 May 2013 19:29:52 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1367779665.248434329b8ffd56b02bd13629a780bfae86f9ce.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/init-early.sh.Linux.in X-VCS-Directories: sh/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 248434329b8ffd56b02bd13629a780bfae86f9ce X-VCS-Branch: master Date: Sun, 5 May 2013 19:29:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4797a5fb-b6e0-4254-b321-81113225d080 X-Archives-Hash: 21c57adf8e737ba21f94305ed35b8417 commit: 248434329b8ffd56b02bd13629a780bfae86f9ce Author: William Hubbs gmail com> AuthorDate: Sun May 5 18:47:45 2013 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun May 5 18:47:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=24843432 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 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