From b4b1e43d026d2da151183932e41365abcb2324f8 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Fri, 22 Sep 2023 21:52:40 +0200 Subject: [PATCH] choose layout from locale --- usr/bin/archboot-localize.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/bin/archboot-localize.sh b/usr/bin/archboot-localize.sh index 0edc91bee..fdeaa72af 100755 --- a/usr/bin/archboot-localize.sh +++ b/usr/bin/archboot-localize.sh @@ -34,11 +34,11 @@ _vconsole_keymap() { [[ -n ${_DETECTED_KEYMAP} ]] && break done _KEYMAP="" - if ${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep "nodeadkeys"; then + if ${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep -q "nodeadkeys"; then _KEYMAP="$(${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep "nodeadkeys")" - elif ${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep "^${_DETECTED_KEYMAP}-latin1$"; then + elif ${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep -q "^${_DETECTED_KEYMAP}-latin1$"; then _KEYMAP="$(${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}" | grep "^${_DETECTED_KEYMAP}-latin1$")" - elif ${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}$"; then + elif ${_LIST_MAPS} | grep -q "^${_DETECTED_KEYMAP}$"; then _KEYMAP="$(${_LIST_MAPS} | grep "^${_DETECTED_KEYMAP}$")" fi }