chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: show whether we follow somebody in 'status' output
[elogind.git]
/
src
/
locale-setup.c
diff --git
a/src/locale-setup.c
b/src/locale-setup.c
index fcbf216d199f67527e19c06d244b5c0b4e12ad3f..ffb4ee999e34965e538a8657e086ec29fab79268 100644
(file)
--- a/
src/locale-setup.c
+++ b/
src/locale-setup.c
@@
-93,9
+93,9
@@
int locale_setup(void) {
}
/* Hmm, nothing set on the kernel cmd line? Then let's
}
/* Hmm, nothing set on the kernel cmd line? Then let's
- * try /etc/locale */
+ * try /etc/locale
.conf
*/
if (r <= 0 &&
if (r <= 0 &&
- (r = parse_env_file("/etc/locale", NEWLINE,
+ (r = parse_env_file("/etc/locale
.conf
", NEWLINE,
"LANG", &variables[VARIABLE_LANG],
"LC_CTYPE", &variables[VARIABLE_LC_CTYPE],
"LC_NUMERIC", &variables[VARIABLE_LC_NUMERIC],
"LANG", &variables[VARIABLE_LANG],
"LC_CTYPE", &variables[VARIABLE_LC_CTYPE],
"LC_NUMERIC", &variables[VARIABLE_LC_NUMERIC],
@@
-112,7
+112,7
@@
int locale_setup(void) {
NULL)) < 0) {
if (r != -ENOENT)
NULL)) < 0) {
if (r != -ENOENT)
- log_warning("Failed to read /etc/locale: %s", strerror(-r));
+ log_warning("Failed to read /etc/locale
.conf
: %s", strerror(-r));
}
#ifdef TARGET_FEDORA
}
#ifdef TARGET_FEDORA
@@
-135,7
+135,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));
}
-#
ifdef TARGET_DEBIAN
+#
elif defined(TARGET_DEBIAN)
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],