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 B07F213835A for ; Sat, 20 Mar 2021 00:16:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C712BE0895; Sat, 20 Mar 2021 00:16:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 AE5D7E0895 for ; Sat, 20 Mar 2021 00:16:32 +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 4BF47335C5D for ; Sat, 20 Mar 2021 00:16:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB600573 for ; Sat, 20 Mar 2021 00:16:29 +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: <1616199154.abbdac08738be00b7194edd91d5fc922c565c51c.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: abbdac08738be00b7194edd91d5fc922c565c51c X-VCS-Branch: master Date: Sat, 20 Mar 2021 00:16:29 +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: 168fb9a0-758f-4598-922c-874fee29eb32 X-Archives-Hash: 6e65a51bf9913872c746f166654e3d58 commit: abbdac08738be00b7194edd91d5fc922c565c51c Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Mar 20 00:08:48 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Mar 20 00:12:34 2021 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=abbdac08 initrd.scripts: setup_keymap(): check console only when dokeymap is set Signed-off-by: Thomas Deutschmann gentoo.org> defaults/initrd.scripts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index ff956b0..2bf736f 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1444,15 +1444,15 @@ cmdline_hwopts() { } setup_keymap() { - local console=$(get_active_console) - if echo "${console}" | grep -qF 'ttyS' - then - warn_msg "Active console is ${console}; Skipping dokeymap ..." - return - fi - if [ "${DO_keymap}" ] then + local console=$(get_active_console) + if echo "${console}" | grep -qF 'ttyS' + then + warn_msg "Active console is ${console}; Skipping dokeymap ..." + return + fi + if [ ! -e /dev/vc/0 -a ! -e /dev/tty0 ] then DEVBIND=1