From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 22 Apr 2020 18:34:02 +0000 (+0200)
Subject: core: make sure to restore the control command id, too
X-Git-Tag: archive/raspbian/245.5-3+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eaf77c9c2b72a46fff7d9a21b3f4aff41da23112;p=systemd.git

core: make sure to restore the control command id, too

Fixes: #15356
(cherry picked from commit e9da62b18af647bfa73807e1c7fc3bfa4bb4b2ac)

Gbp-Pq: Name core-make-sure-to-restore-the-control-command-id-too.patch
---

diff --git a/src/core/service.c b/src/core/service.c
index 9a26271f..40760b60 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2826,9 +2826,10 @@ static int service_deserialize_exec_command(Unit *u, const char *key, const char
                                 break;
         }
 
-        if (command && control)
+        if (command && control) {
                 s->control_command = command;
-        else if (command)
+                s->control_command_id = id;
+        } else if (command)
                 s->main_command = command;
         else
                 log_unit_warning(u, "Current command vanished from the unit file, execution of the command list won't be resumed.");