Skip to content

Commit

Permalink
fix(i18n): do not fail if FONT in /etc/vconsole.conf has the file ext…
Browse files Browse the repository at this point in the history
…ension

If the FONT option defined in /etc/vconsole.conf refers to a file with its
extension, not just the file name, dracut should not fail and install it. The
systemd-vconsole-setup service ends up calling setfont, which supports both file
names and files with extensions.
  • Loading branch information
aafeijoo-suse authored and johannbg committed Sep 26, 2022
1 parent 401158e commit e1de5bd
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions modules.d/10i18n/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,12 @@ install() {
inst_opt_decompress "${kbddir}"/consolefonts/"${DEFAULT_FONT}".*
if [[ ${FONT} ]] && [[ ${FONT} != "${DEFAULT_FONT}" ]]; then
FONT=${FONT%.psf*}
inst_opt_decompress "${kbddir}"/consolefonts/"${FONT}".*
if [[ -f "${kbddir}"/consolefonts/"${FONT}" ]]; then
inst_opt_decompress "${kbddir}"/consolefonts/"${FONT}"
else
FONT=${FONT%.psf*}
inst_opt_decompress "${kbddir}"/consolefonts/"${FONT}".*
fi
fi
if [[ ${FONT_MAP} ]]; then
Expand Down

0 comments on commit e1de5bd

Please sign in to comment.