From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C67CC13835A for ; Sun, 14 Mar 2021 20:06:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 246B1E0855; Sun, 14 Mar 2021 20:06:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10778E0855 for ; Sun, 14 Mar 2021 20:06:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28C96335D89 for ; Sun, 14 Mar 2021 20:05:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 989705AC for ; Sun, 14 Mar 2021 20:05:56 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1615750442.6f2867c2bcc027cfe088804dfeb5d3a6b3866a3e.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/linuxrc X-VCS-Directories: defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 6f2867c2bcc027cfe088804dfeb5d3a6b3866a3e X-VCS-Branch: master Date: Sun, 14 Mar 2021 20:05:56 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3dfe6866-0da7-43d1-9eb6-16fb1c53154a X-Archives-Hash: 2a9fb74a08611141d4e76541ed39f2ac commit: 6f2867c2bcc027cfe088804dfeb5d3a6b3866a3e Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Mar 13 19:09:48 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Mar 14 19:34:02 2021 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6f2867c2 linuxrc: Skip loading embedded boot font for serial consoles Signed-off-by: Thomas Deutschmann gentoo.org> defaults/linuxrc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/defaults/linuxrc b/defaults/linuxrc index acb246c..7888130 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -453,7 +453,13 @@ good_msg "${gk_ver} (${gk_build_date}). Linux kernel ${kernel_ver}" if [ "${GK_BOOTFONT_DISABLED}" = '0' -a -e /lib/console/font ] then - hash setfont >/dev/null 2>&1 && run setfont /lib/console/font -C ${CONSOLE} 2>&1 + if echo "$(get_active_console)" | grep -qF ttyS + then + warn_msg "Active console is ${console}; Not loading embedded boot font ..." + elif hash setfont >/dev/null 2>&1 + then + run setfont /lib/console/font -C ${CONSOLE} 2>&1 + fi fi quiet_kmsg