summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-09-21 15:08:04 +0200
committerKay Sievers <kay.sievers@vrfy.org>2010-09-21 15:08:04 +0200
commit03aeb5bed092376b165b1f85e85f40e2abc35009 (patch)
tree7c6474ec5e67cd37301a1e5266714556798b79d7
parentb15124f1668e15c825e74408eacb5ad8004964c1 (diff)
suse: locale + vconsole compat support
-rw-r--r--src/locale-setup.c10
-rw-r--r--src/vconsole-setup.c19
2 files changed, 29 insertions, 0 deletions
diff --git a/src/locale-setup.c b/src/locale-setup.c
index d2e1b50085..2504216559 100644
--- a/src/locale-setup.c
+++ b/src/locale-setup.c
@@ -125,6 +125,16 @@ int locale_setup(void) {
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)
if (r <= 0 &&
(r = parse_env_file("/etc/rc.conf", NEWLINE,
diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
index 21f240182d..0fd426c6e6 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
@@ -232,6 +232,25 @@ int main(int argc, char **argv) {
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)
if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
"KEYMAP", &vc_keymap,