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: v246-rc1~526^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9da62b18af647bfa73807e1c7fc3bfa4bb4b2ac;p=thirdparty%2Fsystemd.git

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

Fixes: #15356
---

diff --git a/src/core/service.c b/src/core/service.c
index 861d82041a6..7d5928e455c 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2834,9 +2834,10 @@ static int service_deserialize_exec_command(
                                 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.");