commit: abbdac08738be00b7194edd91d5fc922c565c51c Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sat Mar 20 00:08:48 2021 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> 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 <whissi <AT> 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