summaryrefslogtreecommitdiff
path: root/src/locale-setup.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-11-08 19:44:16 +0100
committerLennart Poettering <lennart@poettering.net>2011-11-08 19:44:16 +0100
commit1e2579fdeb7608719cb28da0b5061f48ba0efc34 (patch)
tree83352697294bd24015efdce199e8fbc3d2788f6e /src/locale-setup.c
parenta40593a0d0d740efa387e35411e1e456a6c5aba7 (diff)
parent4cbd9ecf45f64c3a9acc99d473fbf3be3687ae24 (diff)
Merge branch 'master' into journal
Diffstat (limited to 'src/locale-setup.c')
-rw-r--r--src/locale-setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/locale-setup.c b/src/locale-setup.c
index 340293619f..7f692e9c5d 100644
--- a/src/locale-setup.c
+++ b/src/locale-setup.c
@@ -199,7 +199,7 @@ int locale_setup(void) {
if (r != -ENOENT)
log_warning("Failed to read /etc/profile.env: %s", strerror(-r));
}
-#elif defined(TARGET_MANDRIVA)
+#elif defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA )
if (r <= 0 &&
(r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"LANG", &variables[VARIABLE_LANG],