forked from pool/systemd
3856bb52b7
(please also push to 13.1, I want the same version as F20) - Add 0001-gpt-auto-generator-exit-immediately-if-in-container.patch: don't start gpt auto-generator in container (git). - Add 0001-manager-when-verifying-whether-clients-may-change-en.patch: fix reload check in selinux case (git). - Add 0001-logind-fix-bus-introspection-data-for-TakeControl.patch: fix introspection for TakeControl (git). - Add 0001-mount-check-for-NULL-before-reading-pm-what.patch: fix crash when parsing some incorrect unit (git). - Add 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch: Fix udev rules parsing (git). - Add 0001-systemd-serialize-deserialize-forbid_restart-value.patch: Fix incorrect deserialization for forbid_restart (git). - Add 0001-core-unify-the-way-we-denote-serialization-attribute.patch: Ensure forbid_restart is named like other attributes (git). - Add 0001-journald-fix-minor-memory-leak.patch: fix memleak in journald (git). - Add 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch: Improve ACPI firmware performance parsing (git). - Add 0001-journald-remove-rotated-file-from-hashmap-when-rotat.patch: Fix journal rotation (git). - Add 0001-login-fix-invalid-free-in-sd_session_get_vt.patch: Fix memory corruption in sd_session_get_vt (git). OBS-URL: https://build.opensuse.org/request/show/203387 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=454
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From 8d1a28020409ee4afea6ef8c1c4d3522a209284e Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 9 Oct 2013 00:13:55 +0200
|
|
Subject: [PATCH] core: unify the way we denote serialization attributes
|
|
|
|
---
|
|
src/core/service.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/core/service.c b/src/core/service.c
|
|
index 98b1599..96ed2d3 100644
|
|
--- a/src/core/service.c
|
|
+++ b/src/core/service.c
|
|
@@ -2652,7 +2652,7 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
|
|
unit_serialize_item(u, f, "var-tmp-dir", s->exec_context.var_tmp_dir);
|
|
|
|
if (s->forbid_restart)
|
|
- unit_serialize_item(u, f, "forbid_restart", yes_no(s->forbid_restart));
|
|
+ unit_serialize_item(u, f, "forbid-restart", yes_no(s->forbid_restart));
|
|
|
|
return 0;
|
|
}
|
|
@@ -2790,12 +2790,12 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
|
|
return log_oom();
|
|
|
|
s->exec_context.var_tmp_dir = t;
|
|
- } else if (streq(key, "forbid_restart")) {
|
|
+ } else if (streq(key, "forbid-restart")) {
|
|
int b;
|
|
|
|
b = parse_boolean(value);
|
|
if (b < 0)
|
|
- log_debug_unit(u->id, "Failed to parse forbid_restart value %s", value);
|
|
+ log_debug_unit(u->id, "Failed to parse forbid-restart value %s", value);
|
|
else
|
|
s->forbid_restart = b;
|
|
} else
|
|
--
|
|
1.8.4
|
|
|