a6c42807cc
- Update to release 202:
+ 'systemctl list-jobs' got some polishing. '--type=' argument
may now be passed more than once. 'systemctl list-sockets' has
been added.
+ systemd gained a new unit 'systemd-static-nodes.service'
that generates static device nodes earlier during boot, and
can run in conjunction with udev.
+ systemd-nspawn now places all containers in the new /machine
top-level cgroup directory in the name=systemd hierarchy.
+ bootchart can now store its data in the journal.
+ journactl can now take multiple --unit= and --user-unit=
switches.
+ The cryptsetup logic now understands the "luks.key=" kernel
command line switch. If a configured key file is missing, it
will fallback to prompting the user.
- Rebase some patches
- Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch to
properly handle SYSTEMCTL_OPTIONS
- Fix regression in the default for tmp auto-deletion
(systemd-tmp-safe-defaults.patch, FATE#314974).
- Add chromebook lid switch as a power switch to logind rule to
enable suspend on lid close
- Update to release 202:
+ 'systemctl list-jobs' got some polishing. '--type=' argument
may now be passed more than once. 'systemctl list-sockets' has
been added.
+ systemd gained a new unit 'systemd-static-nodes.service'
OBS-URL: https://build.opensuse.org/request/show/172582
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=365
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]) {
|