From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Feb 2011 11:54:06 +0000 (+0100)
Subject: locale: unify some code between fedora and altlinux
X-Git-Tag: v18~52
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=022ef2064f4b1bf0222341c6912680e52a4ec10d;p=systemd

locale: unify some code between fedora and altlinux
---

diff --git a/src/locale-setup.c b/src/locale-setup.c
index 9ac68d2f..2360cea8 100644
--- a/src/locale-setup.c
+++ b/src/locale-setup.c
@@ -115,7 +115,7 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
         }
 
-#ifdef TARGET_FEDORA
+#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX)
         if (r <= 0 &&
             (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
                                 "LANG", &variables[VARIABLE_LANG],
@@ -155,16 +155,6 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
         }
 
-#elif defined(TARGET_ALTLINUX)
-        if (r <= 0 &&
-            (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
-                                "LANG", &variables[VARIABLE_LANG],
-                                NULL)) < 0) {
-
-                if (r != -ENOENT)
-                        log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
-        }
-
 #elif defined(TARGET_GENTOO)
         /* Gentoo's openrc expects locale variables in /etc/env.d/
          * These files are later compiled by env-update into shell