chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a338bab
)
locale: unify some code between fedora and altlinux
author
Lennart Poettering
<lennart@poettering.net>
Tue, 8 Feb 2011 11:54:06 +0000
(12:54 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 8 Feb 2011 11:54:06 +0000
(12:54 +0100)
src/locale-setup.c
patch
|
blob
|
history
diff --git
a/src/locale-setup.c
b/src/locale-setup.c
index 9ac68d2f396d7832fb5207f5fc8d37e789821a73..2360cea85bac7e4bc22e254f9614742edb285d49 100644
(file)
--- 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));
}
log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
}
-#if
def TARGET_FEDORA
+#if
defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX)
if (r <= 0 &&
(r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"LANG", &variables[VARIABLE_LANG],
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));
}
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
#elif defined(TARGET_GENTOO)
/* Gentoo's openrc expects locale variables in /etc/env.d/
* These files are later compiled by env-update into shell