[systemd-commits] 2 commits - Makefile.am src/locale-setup.c src/vconsole-setup.c

[Kay Sievers]

 Makefile.am          |    4 +++-
 src/locale-setup.c   |   10 ++++++++++
 src/vconsole-setup.c |   19 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 03aeb5bed092376b165b1f85e85f40e2abc35009
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Tue Sep 21 15:08:04 2010 +0200

    suse: locale + vconsole compat support

diff --git a/src/locale-setup.c b/src/locale-setup.c
index d2e1b50..2504216 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 21f2401..0fd426c 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,
commit b15124f1668e15c825e74408eacb5ad8004964c1
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Tue Sep 21 15:07:43 2010 +0200

    tmpwatch: install the unit files

diff --git a/Makefile.am b/Makefile.am
index b5b2a9d..f57482a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -183,7 +183,9 @@ dist_systemunit_DATA = \
 	units/remount-rootfs.service \
 	units/printer.target \
 	units/bluetooth.target \
-	units/smartcard.target
+	units/smartcard.target \
+	units/tmpwatch.service \
+	units/tmpwatch.timer
 
 nodist_systemunit_DATA = \
 	units/sysinit.target \