d76216e1f9
(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
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 6aca9a587d4ad40b1c044f99e3714022201b9fd4 Mon Sep 17 00:00:00 2001
|
|
From: Sylvia Else <sylviabz1@cryogenic.net>
|
|
Date: Sun, 6 Oct 2013 23:06:35 -0400
|
|
Subject: [PATCH] systemd: serialize/deserialize forbid_restart value
|
|
|
|
The Service type's forbid_restart field was not preserved by
|
|
serialization/deserialization, so the fact that the service should not
|
|
be restarted after stopping was lost.
|
|
|
|
If a systemctl stop foo command has been given, but the foo service
|
|
has not yet stopped, and then the systemctl --system daemon-reload was
|
|
given, then when the foo service eventually stopped, systemd would
|
|
restart it.
|
|
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=69800
|
|
---
|
|
src/core/service.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/src/core/service.c b/src/core/service.c
|
|
index 6792024..98b1599 100644
|
|
--- a/src/core/service.c
|
|
+++ b/src/core/service.c
|
|
@@ -2651,6 +2651,9 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
|
|
if (s->exec_context.var_tmp_dir)
|
|
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));
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
@@ -2787,6 +2790,14 @@ 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")) {
|
|
+ int b;
|
|
+
|
|
+ b = parse_boolean(value);
|
|
+ if (b < 0)
|
|
+ log_debug_unit(u->id, "Failed to parse forbid_restart value %s", value);
|
|
+ else
|
|
+ s->forbid_restart = b;
|
|
} else
|
|
log_debug_unit(u->id, "Unknown serialization key '%s'", key);
|
|
|
|
--
|
|
1.8.4
|
|
|