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

fix(i18n): a couple of fixes for --sysroot #2618

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(i18n): a couple of fixes for --sysroot #2618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25fbcc5
fix(i18n): handle keymap includes with `--sysroot`
aafeijoo-suse Feb 7, 2024
c3c4186
fix(dracut-init.sh): handle decompress with `--sysroot`
aafeijoo-suse Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dracut-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ inst_decompress() {
inst_simple "${_src}"
# Decompress with chosen tool. We assume that tool changes name e.g.
# from 'name.gz' to 'name'.
${_cmd} "${initdir}${_src}"
${_cmd} "${initdir}${_src#"$dracutsysrootdir"}"
done
}

Expand Down
2 changes: 1 addition & 1 deletion modules.d/10i18n/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ install() {
local CMD
local FN

if [[ -f $dracutsysrootdir$1 ]]; then
if [[ -f $1 ]]; then
MAPS=("$1")
else
MAPNAME=${1%.map*}
Expand Down
Loading