Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

handle symlinked keymap #2613

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

handle symlinked keymap #2613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 15 additions & 2 deletions modules.d/10i18n/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -160,6 +160,7 @@ install() {

install_local_i18n() {
local map
local maplink

# shellcheck disable=SC2086
eval "$(gather_vars ${i18n_vars})"
Expand Down Expand Up @@ -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}".*
Expand Down