kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

10i18n: Fix keymaps not getting included sometimes 

Eliminate erroneous substring matches when looking up already processed keymaps to prevent necessary keymaps not getting added to the initramfs sometimes e.g. if there are the files 'compose.latin1' and 'compose.latin1.add' the unfixed version would skip processing 'compose.latin1' if find returned 'compose.latin1.add' first due to the directory listing not being in sorted order.
master
Jens Heise 2019-01-07 16:47:23 +01:00 committed by Harald Hoyer
parent 58e0d2d5b5
commit 44f2fe5170
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules.d/10i18n/module-setup.sh
View File

@ -36,7 +36,7 @@ install() {
MAPS=$(find ${kbddir}/keymaps -type f -name ${MAPNAME} -o -name ${MAPNAME}.map -o -name ${MAPNAME}.map.\*) MAPS=$(find ${kbddir}/keymaps -type f -name ${MAPNAME} -o -name ${MAPNAME}.map -o -name ${MAPNAME}.map.\*)


for map in $MAPS; do for map in $MAPS; do
KEYMAPS="$KEYMAPS $map" KEYMAPS="$KEYMAPS $map "
case $map in case $map in
*.gz) cmd=zgrep;; *.gz) cmd=zgrep;;
*.bz2) cmd=bzgrep;; *.bz2) cmd=bzgrep;;
@ -45,7 +45,7 @@ install() {


for INCL in $($cmd "^include " $map | while read a a b || [ -n "$a" ]; do echo ${a//\"/}; done); do for INCL in $($cmd "^include " $map | while read a a b || [ -n "$a" ]; do echo ${a//\"/}; done); do
for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do
strstr "$KEYMAPS" "$FN" || findkeymap $FN strstr "$KEYMAPS" " $FN " || findkeymap $FN
done done
done done
done done