From: Thomas Blume <Thomas.Blume@suse.com>
Date: Mon, 22 Jan 2024 09:28:00 +0000 (+0100)
Subject: fix(i18n): handle symlinked keymap
X-Git-Tag: 100~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f73bc8b5bf4f19a805c2fefecf3e8bd2b59b17d;p=thirdparty%2Fdracut-ng.git

fix(i18n): handle symlinked keymap

handle keymaps that are symlinks to others, for example:

KEYMAP=de-nodeadkeys in vconsole.conf is:

lrwxrwxrwx 1 root root 20 17. Mai 2023  /usr/share/kbd/keymaps/xkb/de-nodeadkeys.map.gz -> at-nodeadkeys.map.gz
---

diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index ac456112f..ffd2f2c55 100755
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -44,7 +44,7 @@ install() {
             MAPNAME=${1%.map*}
 
             mapfile -t -d '' MAPS < <(
-                find "${dracutsysrootdir}${kbddir}"/keymaps/ -type f \( -name "${MAPNAME}" -o -name "${MAPNAME}.map*" \) -print0
+                find "${dracutsysrootdir}${kbddir}"/keymaps/ -type f,l \( -name "${MAPNAME}" -o -name "${MAPNAME}.map*" \) -print0
             )
         fi
 
@@ -160,6 +160,7 @@ install() {
 
     install_local_i18n() {
         local map
+        local maplink
 
         # shellcheck disable=SC2086
         eval "$(gather_vars ${i18n_vars})"
@@ -216,7 +217,19 @@ install() {
         done
 
         for keymap in "${!KEYMAPS[@]}"; do
-            inst_opt_decompress "${keymap}"
+            if [[ -L ${keymap} ]]; then
+                maplink=$(readlink -f "${keymap}")
+                # skip symlinked directories
+                [[ -d ${maplink} ]] && continue
+
+                inst_opt_decompress "${maplink}"
+                # create new symlink to decompressed keymap
+                maplink=${maplink%.gz}
+                keymap=${keymap%.gz}
+                ln -srn "${initdir}${maplink#"$dracutsysrootdir"}" "${initdir}${keymap#"$dracutsysrootdir"}"
+            else
+                inst_opt_decompress "${keymap}"
+            fi
         done
 
         inst_opt_decompress "${kbddir}"/consolefonts/"${DEFAULT_FONT}".*