picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vconsole: more completely cover fedora legacy vconsole configuration

Browse source
This commit is contained in:
Lennart Poettering 2010-09-18 01:19:46 +02:00
parent efb3237ee6
commit ae509abccc
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/vconsole-setup.c
View file

@ -171,6 +171,8 @@ int main(int argc, char **argv) {
#ifdef TARGET_FEDORA #ifdef TARGET_FEDORA
if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"SYSFONT", &vc_font, "SYSFONT", &vc_font,
"SYSFONTACM", &vc_font_map,
"UNIMAP", &vc_font_unimap,
NULL)) < 0) { NULL)) < 0) {
if (r != -ENOENT) if (r != -ENOENT)
@ -179,11 +181,24 @@ int main(int argc, char **argv) {
if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
"KEYTABLE", &vc_keymap, "KEYTABLE", &vc_keymap,
"KEYMAP", &vc_keymap,
NULL)) < 0) { NULL)) < 0) {
if (r != -ENOENT) if (r != -ENOENT)
log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); 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 #endif
/* Override distribution-specific options with the /* Override distribution-specific options with the