From 9de8f33a0f579466b4ad44b66c68d3e9e5b5df6f Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 27 Nov 2022 17:12:01 +0100
Subject: [PATCH] fix keymap setting with systemd

---
 usr/bin/archboot-km.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/bin/archboot-km.sh b/usr/bin/archboot-km.sh
index 8a0d772b7..1c4998314 100755
--- a/usr/bin/archboot-km.sh
+++ b/usr/bin/archboot-km.sh
@@ -62,11 +62,11 @@ dokeymap() {
     #shellcheck disable=SC2086
     keymap=$(cat ${ANSWER})
     echo "${keymap}" > /tmp/.keymap
-    if [[ "${keymap}" ]]; then
-        DIALOG --infobox "Loading keymap: ${keymap}" 0 0
-        localectl set-keymap "${keymap}" || error_kmset
-        echo "${keymap}" > /tmp/.keymap
-    fi
+    DIALOG --infobox "Loading keymap: ${keymap}" 0 0
+    sed -i -e "s#KEYMAP=.*#KEYMAP=${keymap}#g" /etc/vconsole.conf
+    systemctl restart systemd-vconsole-setup.service
+    echo "${keymap}" > /tmp/.keymap
+
 S_NEXTITEM=2
 }
 
@@ -103,7 +103,7 @@ doconsolefont() {
     sed -i -e "s#FONT=.*#FONT=${font}#g" /etc/vconsole.conf
     systemctl restart systemd-vconsole-setup.service
     sleep 1
-S_NEXTITEM=3
+    S_NEXTITEM=3
 }
 
 mainmenu() {