From: Michael Biebl <biebl@debian.org>
Date: Mon, 27 Sep 2010 16:40:51 +0000 (+0200)
Subject: debian: add locale compat support
X-Git-Tag: v11~71
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7472744bf9eddc7137f03233e49fa780793d5fc0;p=systemd

debian: add locale compat support

Read LANG from /etc/default/locale.
---

diff --git a/src/locale-setup.c b/src/locale-setup.c
index 25042165..fcbf216d 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,