From ac44b87406173f3e518a4656da73ccabb615d431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 30 Nov 2020 16:52:21 +0100 Subject: [PATCH] Non-existing keyboard can be selected in firstlogin script. Adding check (#2385) --- packages/bsp/common/usr/lib/armbian/armbian-firstlogin | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin index e8194bde71..61353b0751 100755 --- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin +++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin @@ -81,10 +81,12 @@ set_timezone_and_locales() locale-gen $LOCALES > /dev/null 2>&1 # adding another keyboard layout - echo -e "Adding console keyboard layout: \x1B[92m$CCODE\x1B[0m" - CCODE=$(cat /etc/default/keyboard | grep XKBLAYOUT | awk -F'"' '$0=$2')",$CCODE" - sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"$CCODE\"/" /etc/default/keyboard - setupcon -k --force + if grep -q " $CCODE " /usr/share/X11/xkb/rules/base.lst ; then + echo -e "Adding console keyboard layout: \x1B[92m$CCODE\x1B[0m" + CCODE=$(cat /etc/default/keyboard | grep XKBLAYOUT | awk -F'"' '$0=$2')",$CCODE" + sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"$CCODE\"/" /etc/default/keyboard + setupcon -k --force + fi fi }