Attachment 116422 Details for Bug 78311 – 0001-Let-some-boolean-survive-a-daemon-reload.patch

[patch] 0001-Let-some-boolean-survive-a-daemon-reload.patch

0001-Let-some-boolean-survive-a-daemon-reload.patch (text/plain), 2.96 KB, created by Werner Fink on 2015-06-10 12:09:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Werner Fink

Created: 2015-06-10 12:09:35 UTC

Size: 2.96 KB

patch

obsolete

>From 5344fced316c465a6e9df72fe8e42d1a30ceb04a Mon Sep 17 00:00:00 2001
>From: Werner Fink <werner@suse.de>
>Date: Wed, 10 Jun 2015 14:00:51 +0200
>Subject: [PATCH] Let some boolean survive a daemon-reload
>
>Without the boolean bus_name_good services as well as cgroup_realized
>for units a unit of Type=dbus and ExecReload sending SIGHUP to $MAINPID
>will be terminated if systemd will be daemon reloaded.
>
>https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746151
>https://bugs.freedesktop.org/show_bug.cgi?id=78311
>https://bugzilla.opensuse.org/show_bug.cgi?id=934077
>---
> src/core/service.c |  9 +++++++++
> src/core/unit.c    | 11 +++++++++++
> 2 files changed, 20 insertions(+)
>
>diff --git a/src/core/service.c b/src/core/service.c
>index c7e6577..9fc3812 100644
>--- a/src/core/service.c
>+++ b/src/core/service.c
>@@ -2008,6 +2008,7 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
>                 unit_serialize_item_format(u, f, "main-pid", PID_FMT, s->main_pid);
> 
>         unit_serialize_item(u, f, "main-pid-known", yes_no(s->main_pid_known));
>+        unit_serialize_item(u, f, "bus-name-good", yes_no(s->bus_name_good));
> 
>         if (s->status_text) {
>                 _cleanup_free_ char *c = NULL;
>@@ -2131,6 +2132,14 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
>                         log_unit_debug(u, "Failed to parse main-pid-known value: %s", value);
>                 else
>                         s->main_pid_known = b;
>+        } else if (streq(key, "bus-name-good")) {
>+                int b;
>+
>+                b = parse_boolean(value);
>+                if (b < 0)
>+                        log_debug_unit(u->id, "Failed to parse bus-name-good value %s", value);
>+                else
>+                        s->bus_name_good = b;
>         } else if (streq(key, "status-text")) {
>                 char *t;
> 
>diff --git a/src/core/unit.c b/src/core/unit.c
>index e380276..717f7c5 100644
>--- a/src/core/unit.c
>+++ b/src/core/unit.c
>@@ -2596,6 +2596,7 @@ int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs) {
> 
>         if (u->cgroup_path)
>                 unit_serialize_item(u, f, "cgroup", u->cgroup_path);
>+        unit_serialize_item(u, f, "cgroup-realized", yes_no(u->cgroup_realized));
> 
>         if (serialize_jobs) {
>                 if (u->job) {
>@@ -2806,6 +2807,16 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
>                                 log_unit_debug_errno(u, r, "Failed to set cgroup path %s, ignoring: %m", v);
> 
>                         continue;
>+                } else if (streq(l, "cgroup-realized")) {
>+                        int b;
>+
>+                        b = parse_boolean(v);
>+                        if (b < 0)
>+                                log_debug("Failed to parse cgroup-realized bool %s", v);
>+                        else
>+                                u->cgroup_realized = b;
>+
>+                        continue;
>                 }
> 
>                 if (unit_can_serialize(u)) {
>-- 
>2.2.0
>

Actions: View | Splinter Review

Attachments on bug 78311: 116393 | 116418 | 116422 | 116430

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.