summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-02-08 12:54:06 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-08 12:54:06 +0100
commit022ef2064f4b1bf0222341c6912680e52a4ec10d (patch)
treefdaafe3ef6fa83436967343ee1a378d1ecb18aa7
parenta338bab5d0603a179befce062bc6fc8a6521a232 (diff)
locale: unify some code between fedora and altlinux
-rw-r--r--src/locale-setup.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/locale-setup.c b/src/locale-setup.c
index 9ac68d2f39..2360cea85b 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