diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-09-18 01:19:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-09-18 01:19:46 +0200 |
| commit | ae509abccc09e0eb463cb17912409c72adb7f7fd (patch) | |
| tree | ca1cca45288118f20c85f2f39cc37a0869021d1e | |
| parent | efb3237ee69bc593b11bc828791ee48ba6cc4f5c (diff) | |
vconsole: more completely cover fedora legacy vconsole configuration
| -rw-r--r-- | src/vconsole-setup.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c index cb8fc43d2f..1412b20943 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 |