From d44c9551c5e7456c2caa4a2815d33ff978dc55ef Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 17 Jan 2024 19:32:54 +0000 Subject: [PATCH] build/roms: regression fix: uninitialised variable the "kmapdir" variable was removed in an earlier audit, but was overlooked for -k because that option was untested. rather than initialise the variable, re-use grubcfgsdir. this fix enables e.g. "-k usdvorak" to work again. Signed-off-by: Leah Rowe --- script/build/roms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build/roms b/script/build/roms index a369d0e8..8278a9ab 100755 --- a/script/build/roms +++ b/script/build/roms @@ -152,7 +152,7 @@ build_grub_payload() [ -f "elf/grub/keymap_$keymap.cfg" ] || printf "keymap %s\n" \ "$keymap" > "elf/grub/keymap_$keymap.cfg" || err "!key"; : done - [ -n "${_keyboard}" ] && keymaps="${kmapdir}/${_keyboard}.gkb" + [ -n "$_keyboard" ] && keymaps="${grubcfgsdir}/keymap/${_keyboard}.gkb" [ -f "$grubelf" ] && return 0 [ -f "src/grub/grub-mkstandalone" ] || x_ ./update trees -b grub