X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Flocale-setup.c;h=b9bd3a0748625008349d3b212ca1ab13e7feadb9;hp=25eb13474a3fecb482fe532251773a84f9cf2c7a;hb=e4f44e734c4f397ee5e7ba3270e014a8ae0043dd;hpb=8401e9f91d65c3d8d49cf0d2e35d03146354e957

diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index 25eb13474..b9bd3a074 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -121,7 +121,7 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
         }
 
-#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX)
+#if defined(TARGET_ALTLINUX)
         if (r <= 0 &&
             (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
                                 "LANG", &variables[VARIABLE_LANG],
@@ -163,16 +163,6 @@ int locale_setup(void) {
                         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,
-                                "LOCALE", &variables[VARIABLE_LANG],
-                                NULL)) < 0) {
-
-                if (r != -ENOENT)
-                        log_warning("Failed to read /etc/rc.conf: %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