mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 10:25:37 +03:00
suse: locale + vconsole compat support
This commit is contained in:
parent
b15124f166
commit
03aeb5bed0
@ -125,6 +125,16 @@ int locale_setup(void) {
|
|||||||
log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
|
log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#elif defined(TARGET_SUSE)
|
||||||
|
if (r <= 0 &&
|
||||||
|
(r = parse_env_file("/etc/sysconfig/language", NEWLINE,
|
||||||
|
"RC_LANG", &variables[VARIABLE_LANG],
|
||||||
|
NULL)) < 0) {
|
||||||
|
|
||||||
|
if (r != -ENOENT)
|
||||||
|
log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
|
||||||
|
}
|
||||||
|
|
||||||
#elif defined(TARGET_ARCH)
|
#elif defined(TARGET_ARCH)
|
||||||
if (r <= 0 &&
|
if (r <= 0 &&
|
||||||
(r = parse_env_file("/etc/rc.conf", NEWLINE,
|
(r = parse_env_file("/etc/rc.conf", NEWLINE,
|
||||||
|
@ -232,6 +232,25 @@ int main(int argc, char **argv) {
|
|||||||
vc_keymap = t;
|
vc_keymap = t;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#elif defined(TARGET_SUSE)
|
||||||
|
if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
|
||||||
|
"KEYTABLE", &vc_keymap,
|
||||||
|
NULL)) < 0) {
|
||||||
|
|
||||||
|
if (r != -ENOENT)
|
||||||
|
log_warning("Failed to read /etc/sysconfig/keyboard: %s", strerror(-r));
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((r = parse_env_file("/etc/sysconfig/console", NEWLINE,
|
||||||
|
"CONSOLE_FONT", &vc_font,
|
||||||
|
"CONSOLE_SCREENMAP", &vc_font_map,
|
||||||
|
"CONSOLE_UNICODEMAP", &vc_font_unimap,
|
||||||
|
NULL)) < 0) {
|
||||||
|
|
||||||
|
if (r != -ENOENT)
|
||||||
|
log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r));
|
||||||
|
}
|
||||||
|
|
||||||
#elif defined(TARGET_ARCH)
|
#elif defined(TARGET_ARCH)
|
||||||
if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
|
if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
|
||||||
"KEYMAP", &vc_keymap,
|
"KEYMAP", &vc_keymap,
|
||||||
|
Loading…
Reference in New Issue
Block a user