chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Implement SocketUser= and SocketGroup= for [Socket]"
[elogind.git]
/
src
/
core
/
locale-setup.c
diff --git
a/src/core/locale-setup.c
b/src/core/locale-setup.c
index 7f692e9c5ddd2bb78b4ca4b760f90945e8312e00..b9bd3a0748625008349d3b212ca1ab13e7feadb9 100644
(file)
--- a/
src/core/locale-setup.c
+++ b/
src/core/locale-setup.c
@@
-6,16
+6,16
@@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU
Lesser
General Public License as published by
+ the Free Software Foundation; either version 2
.1
of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+
Lesser
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU
Lesser
General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
@@
-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_
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],
@@
-163,16
+163,6
@@
int locale_setup(void) {
log_warning("Failed to read /etc/default/locale: %s", strerror(-r));
}
log_warning("Failed to read /etc/default/locale: %s", strerror(-r));
}
-#elif defined(TARGET_ARCH)
- if (r <= 0 &&
- (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));
- }
-
#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