chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: properly write user state files
[elogind.git]
/
src
/
locale-setup.c
diff --git
a/src/locale-setup.c
b/src/locale-setup.c
index e146746dfa82814b9af1b207918c08ebdcb36a8d..33111da2187804d25215b3b85370d295fc2c0049 100644
(file)
--- a/
src/locale-setup.c
+++ b/
src/locale-setup.c
@@
-65,13
+65,13
@@
static const char * const variable_names[_VARIABLE_MAX] = {
int locale_setup(void) {
char *variables[_VARIABLE_MAX];
int locale_setup(void) {
char *variables[_VARIABLE_MAX];
- int r, i;
+ int r
= 0
, i;
zero(variables);
zero(variables);
- if (detect_
virtualization
(NULL) <= 0)
+ if (detect_
container
(NULL) <= 0)
if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
-#if
def TARGET_FEDORA
+#if
defined(TARGET_FEDORA) || defined(TARGET_MEEGO)
"LANG", &variables[VARIABLE_LANG],
#endif
"locale.LANG", &variables[VARIABLE_LANG],
"LANG", &variables[VARIABLE_LANG],
#endif
"locale.LANG", &variables[VARIABLE_LANG],
@@
-116,7
+116,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)
+#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX)
|| defined(TARGET_MEEGO)
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],
@@
-136,7
+136,7
@@
int locale_setup(void) {
log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
}
log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
}
-#elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
+#elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
|| defined(TARGET_ANGSTROM)
if (r <= 0 &&
(r = parse_env_file("/etc/default/locale", NEWLINE,
"LANG", &variables[VARIABLE_LANG],
if (r <= 0 &&
(r = parse_env_file("/etc/default/locale", NEWLINE,
"LANG", &variables[VARIABLE_LANG],