diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-07-05 15:33:28 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-07-05 15:48:40 +0200 |
| commit | f734347ae7da6943342b2a4e7be99b3e2c6feda7 (patch) | |
| tree | 9e0414f80ccc6ac5c970f387dee609c0702023f7 /modules.d/10i18n/module-setup.sh | |
| parent | 4aca0017e8ebcead5d32cf5b85ce082eb19f3dba (diff) | |
| download | dracut-f734347ae7da6943342b2a4e7be99b3e2c6feda7.tar.gz | |
modules.d/10i18n/module-setup.sh: handle empty vconsole.conf
if /etc/vconsole.conf exists and is empty, then do not install anything.
Diffstat (limited to 'modules.d/10i18n/module-setup.sh')
| -rwxr-xr-x | modules.d/10i18n/module-setup.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh index a91b5806..b309faa7 100755 --- a/modules.d/10i18n/module-setup.sh +++ b/modules.d/10i18n/module-setup.sh @@ -12,6 +12,15 @@ depends() { } install() { + if dracut_module_included "systemd"; then + [[ -f /etc/vconsole.conf ]] || return 0 + unset FONT + unset KEYMAP + . /etc/vconsole.conf + # if vconsole.conf has no settings, do not include anything + [[ $FONT ]] || [[ $KEYMAP ]] || return 0 + fi + dracut_install -o $systemdutildir/systemd-vconsole-setup KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps DEFAULT_FONT="${i18n_default_font:-LatArCyrHeb-16}" |