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
(from parent 1:
4243135
)
locale: set LANG on Arch
author
Tom Gundersen
<teg@jklm.no>
Sat, 18 Sep 2010 22:43:53 +0000
(23:43 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 20 Sep 2010 21:14:28 +0000
(23:14 +0200)
This variable is defined in /etc/rc.conf
src/locale-setup.c
patch
|
blob
|
history
diff --git
a/src/locale-setup.c
b/src/locale-setup.c
index 923be045e15fc711150d325ac41a684a2f5b5193..675a739a5c44656e714d273d8010745159073dd6 100644
(file)
--- a/
src/locale-setup.c
+++ b/
src/locale-setup.c
@@
-76,6
+76,14
@@
int locale_setup(void) {
if (r != -ENOENT)
log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
}
+#elif defined(TARGET_ARCH)
+ if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
+ "LOCALE", &variables[VARIABLE_LANG],
+ NULL)) < 0) {
+
+ if (r != -ENOENT)
+ log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
+ }
#endif
/* Override distribution-specific options with the