SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove Fedora hostname, locale, vconsole legacy file support

Browse Source
This commit is contained in:
Kay Sievers
2012-10-24 03:51:06 +02:00
parent 1ada30ac51
commit cae356ad49
3 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vconsole/vconsole-setup.c
+1 -30
View File
@@ -245,36 +245,7 @@ int main(int argc, char **argv) {
}
if (r <= 0) {
#if defined(TARGET_FEDORA)
r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"SYSFONT", &vc_font,
"SYSFONTACM", &vc_font_map,
"UNIMAP", &vc_font_unimap,
NULL);
if (r < 0 && r != -ENOENT)
log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
"KEYTABLE", &vc_keymap,
"KEYMAP", &vc_keymap,
NULL);
if (r < 0 && r != -ENOENT)
log_warning("Failed to read /etc/sysconfig/keyboard: %s", strerror(-r));
if (access("/etc/sysconfig/console/default.kmap", F_OK) >= 0) {
char *t;
t = strdup("/etc/sysconfig/console/default.kmap");
if (!t) {
log_oom();
goto finish;
}
free(vc_keymap);
vc_keymap = t;
}
#elif defined(TARGET_SUSE)
#if defined(TARGET_SUSE)
r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
"KEYTABLE", &vc_keymap,
NULL);