From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 17 Sep 2010 23:19:46 +0000 (+0200)
Subject: vconsole: more completely cover fedora legacy vconsole configuration
X-Git-Tag: v11~130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae509abccc09e0eb463cb17912409c72adb7f7fd;p=thirdparty%2Fsystemd.git

vconsole: more completely cover fedora legacy vconsole configuration
---

diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
index cb8fc43d2f4..1412b20943e 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
@@ -171,6 +171,8 @@ int main(int argc, char **argv) {
 #ifdef TARGET_FEDORA
         if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
                                 "SYSFONT", &vc_font,
+                                "SYSFONTACM", &vc_font_map,
+                                "UNIMAP", &vc_font_unimap,
                                 NULL)) < 0) {
 
                 if (r != -ENOENT)
@@ -179,11 +181,24 @@ int main(int argc, char **argv) {
 
         if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
                                 "KEYTABLE", &vc_keymap,
+                                "KEYMAP", &vc_keymap,
                                 NULL)) < 0) {
 
                 if (r != -ENOENT)
                         log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
         }
+
+        if (access("/etc/sysconfig/console/default.kmap", F_OK) >= 0) {
+                char *t;
+
+                if (!(t = strdup("/etc/sysconfig/console/default.kmap"))) {
+                        log_error("Out of memory.");
+                        goto finish;
+                }
+
+                free(vc_keymap);
+                vc_keymap = t;
+        }
 #endif
 
         /* Override distribution-specific options with the