a699b1ca34
- Do not provide %{release} for systemd-analyze
- Add more conflicts to -mini packages
- Disable Predictable Network interface names until it has been
reviewed by network team, with /usr/lib/tmpfiles.d/network.conf.
- Don't package /usr/lib/firmware/update (not used) (forwarded request 172848 from fcrozat)
OBS-URL: https://build.opensuse.org/request/show/172873
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=135
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Tue, 4 Dec 2012 16:51:32 +0000
|
|
Subject: handle root_uses_lang value in /etc/sysconfig/language
|
|
|
|
handle ROOT_USES_LANG=ctype (bnc#792182).
|
|
---
|
|
src/core/locale-setup.c | 27 +++++++++++++++++++++++++++
|
|
1 file changed, 27 insertions(+)
|
|
|
|
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
|
|
index d7113b9..b3fb603 100644
|
|
--- a/src/core/locale-setup.c
|
|
+++ b/src/core/locale-setup.c
|
|
@@ -70,6 +70,11 @@ static const char * const variable_names[_VARIABLE_MAX] = {
|
|
int locale_setup(void) {
|
|
char *variables[_VARIABLE_MAX] = {};
|
|
int r = 0, i;
|
|
+#ifdef HAVE_SYSV_COMPAT
|
|
+ char _cleanup_free_ *root_uses_lang;
|
|
+
|
|
+ zero(root_uses_lang);
|
|
+#endif
|
|
|
|
if (detect_container(NULL) <= 0) {
|
|
r = parse_env_file("/proc/cmdline", WHITESPACE,
|
|
@@ -117,6 +122,28 @@ int locale_setup(void) {
|
|
log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
|
|
}
|
|
|
|
+#ifdef HAVE_SYSV_COMPAT
|
|
+ if (r <= 0 &&
|
|
+ (r = parse_env_file("/etc/sysconfig/language", NEWLINE,
|
|
+ "ROOT_USES_LANG", &root_uses_lang,
|
|
+ "RC_LANG", &variables[VARIABLE_LANG],
|
|
+ NULL)) < 0) {
|
|
+
|
|
+ if (r != -ENOENT)
|
|
+ log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
|
|
+ } else {
|
|
+ if (!root_uses_lang || (root_uses_lang && !strcaseeq(root_uses_lang,"yes"))) {
|
|
+ if (root_uses_lang && strcaseeq(root_uses_lang,"ctype"))
|
|
+ variables[VARIABLE_LC_CTYPE]=variables[VARIABLE_LANG];
|
|
+ else
|
|
+ free(variables[VARIABLE_LANG]);
|
|
+
|
|
+ variables[VARIABLE_LANG]=strdup("POSIX");
|
|
+ }
|
|
+ }
|
|
+
|
|
+#endif
|
|
+
|
|
if (!variables[VARIABLE_LANG]) {
|
|
variables[VARIABLE_LANG] = strdup("C");
|
|
if (!variables[VARIABLE_LANG]) {
|