aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2021-03-20 01:08:48 +0100
committerThomas Deutschmann <whissi@gentoo.org>2021-03-20 01:12:34 +0100
commitabbdac08738be00b7194edd91d5fc922c565c51c (patch)
tree0718262717aa1ab90a06d197880b95b8f63be345
parentgenkernel: bump to v4.2.0 (diff)
downloadgenkernel-abbdac08738be00b7194edd91d5fc922c565c51c.tar.gz
genkernel-abbdac08738be00b7194edd91d5fc922c565c51c.tar.bz2
genkernel-abbdac08738be00b7194edd91d5fc922c565c51c.zip
initrd.scripts: setup_keymap(): check console only when dokeymap is set
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--defaults/initrd.scripts14
1 files 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