JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Non-existing keyboard can be selected in firstlogin script. Adding check (#2385)

Browse Source
This commit is contained in:
Igor Pečovnik
2020-11-30 16:52:21 +01:00
committed by GitHub
parent bce3a717a9
commit ac44b87406
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/bsp/common/usr/lib/armbian/armbian-firstlogin
View File

@@ -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
}