From: Harald Hoyer <harald@redhat.com>
Date: Fri, 5 Jul 2013 13:33:28 +0000 (+0200)
Subject: modules.d/10i18n/module-setup.sh: handle empty vconsole.conf
X-Git-Tag: 030~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f734347ae7da6943342b2a4e7be99b3e2c6feda7;p=thirdparty%2Fdracut.git

modules.d/10i18n/module-setup.sh: handle empty vconsole.conf

if /etc/vconsole.conf exists and is empty, then do not install anything.
---

diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index a91b5806c..b309faa70 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}"