chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: don't hit an assert if a service unit changes type and we get a spurious...
[elogind.git]
/
src
/
core
/
locale-setup.c
diff --git
a/src/core/locale-setup.c
b/src/core/locale-setup.c
index aab454e83b1042f5b62f09a0ec960f96d3b9e4c2..25eb13474a3fecb482fe532251773a84f9cf2c7a 100644
(file)
--- a/
src/core/locale-setup.c
+++ b/
src/core/locale-setup.c
@@
-74,7
+74,7
@@
int locale_setup(void) {
if (detect_container(NULL) <= 0)
if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
if (detect_container(NULL) <= 0)
if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
-#if defined(TARGET_FEDORA)
|| defined(TARGET_MEEGO)
+#if defined(TARGET_FEDORA)
"LANG", &variables[VARIABLE_LANG],
#endif
"locale.LANG", &variables[VARIABLE_LANG],
"LANG", &variables[VARIABLE_LANG],
#endif
"locale.LANG", &variables[VARIABLE_LANG],
@@
-121,7
+121,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 defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX)
|| defined(TARGET_MEEGO)
+#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],