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 CFA51138A9F for ; Sun, 17 Feb 2013 02:49:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C65CFE0508; Sun, 17 Feb 2013 02:49:17 +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 2A0D8E0508 for ; Sun, 17 Feb 2013 02:49:17 +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 40ACE33DB63 for ; Sun, 17 Feb 2013 02:49:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CBB98E4073 for ; Sun, 17 Feb 2013 02:49:13 +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: <1361065875.746bf5f78376e2e7b3e8bc843dfa1e4a3fa6a8e4.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/, sh/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/consolefont.in sh/init-early.sh.Linux.in X-VCS-Directories: init.d/ sh/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 746bf5f78376e2e7b3e8bc843dfa1e4a3fa6a8e4 X-VCS-Branch: master Date: Sun, 17 Feb 2013 02:49:13 +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: d4dfa15f-e709-49b7-a134-736e2961ab94 X-Archives-Hash: 53e77cde5f6ed85d3f5cf25d5b9da4ce commit: 746bf5f78376e2e7b3e8bc843dfa1e4a3fa6a8e4 Author: Andrew Gregory gmail com> AuthorDate: Tue Feb 12 03:13:27 2013 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Feb 17 01:51:15 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=746bf5f7 consolefont: use setfont to save the current font Using setfont directly to save the font prevents breakage when a distro stores consolefonts in a location other than /usr/share/consolefonts such as Arch which stores them in /usr/share/kbd/consolefonts Signed-off-by: Andrew Gregory gmail.com> --- init.d/consolefont.in | 8 ++------ sh/init-early.sh.Linux.in | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/init.d/consolefont.in b/init.d/consolefont.in index 66b780d..0e91d13 100644 --- a/init.d/consolefont.in +++ b/init.d/consolefont.in @@ -53,14 +53,10 @@ start() done eend $retval - # Store the last font so we can use it ASAP on boot + # Store the font so we can use it ASAP on boot if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then mkdir -p "$RC_LIBEXECDIR"/console - for font in /usr/share/consolefonts/"$consolefont".*; do - : - done - cp "$font" "$RC_LIBEXECDIR"/console - echo "${font##*/}" >"$RC_LIBEXECDIR"/console/font + setfont -O "$RC_LIBEXECDIR"/console/font fi return $retval diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in index fb3860a..f9d2388 100644 --- a/sh/init-early.sh.Linux.in +++ b/sh/init-early.sh.Linux.in @@ -31,9 +31,8 @@ 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 - font="$(cat "$RC_LIBEXECDIR"/console/font)" [ -c "$CONSOLE" ] && cons="-C $CONSOLE" - setfont $cons "$RC_LIBEXECDIR"/console/"$font" 2>/dev/null + setfont $cons "$RC_LIBEXECDIR"/console/font 2>/dev/null fi fi