[systemd-commits] src/locale-setup.c

[Michael Biebl]

 src/locale-setup.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 7472744bf9eddc7137f03233e49fa780793d5fc0
Author: Michael Biebl <biebl at debian.org>
Date:   Mon Sep 27 18:40:51 2010 +0200

    debian: add locale compat support
    
    Read LANG from /etc/default/locale.

diff --git a/src/locale-setup.c b/src/locale-setup.c
index 2504216..fcbf216 100644
--- a/src/locale-setup.c
+++ b/src/locale-setup.c
@@ -135,6 +135,16 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
         }
 
+#ifdef TARGET_DEBIAN
+        if (r <= 0 &&
+            (r = parse_env_file("/etc/default/locale", NEWLINE,
+                                "LANG", &variables[VARIABLE_LANG],
+                                NULL)) < 0) {
+
+                if (r != -ENOENT)
+                        log_warning("Failed to read /etc/default/locale: %s", strerror(-r));
+        }
+
 #elif defined(TARGET_ARCH)
         if (r <= 0 &&
             (r = parse_env_file("/etc/rc.conf", NEWLINE,