]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
Fix wrong keymap inclusion 163/head
authorFabian Vogt <fvogt@suse.com>
Fri, 17 Jun 2016 12:25:13 +0000 (14:25 +0200)
committerHarald Hoyer <harald@redhat.com>
Fri, 17 Jun 2016 13:03:28 +0000 (15:03 +0200)
For MAP=lt, dracut would choose lt.std.map instead of lt.map.

Signed-off-by: Fabian Vogt <fvogt@suse.com>
modules.d/10i18n/module-setup.sh

index 9618aa7752d0835e6f3af5d1de34732ea7d80f0a..2eae5d04eb7dd0b28a64683e5bf0d06d47d8db05 100755 (executable)
@@ -30,8 +30,9 @@ install() {
     # This is from 10redhat-i18n.
     findkeymap () {
         local MAP=$1
+        local MAPNAME=${1%.map*}
         [[ ! -f $MAP ]] && \
-            MAP=$(find ${kbddir}/keymaps -type f -name $MAP -o -name $MAP.\* | head -n1)
+            MAP=$(find ${kbddir}/keymaps -type f -name ${MAPNAME} -o -name ${MAPNAME}.map -o -name ${MAPNAME}.map.\* | head -n1)
         [[ " $KEYMAPS " = *" $MAP "* ]] && return
         KEYMAPS="$KEYMAPS $MAP"
         case $MAP in