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 5f5bcb33ba0e3fc526c26f4d109c54f9b9c0ff30..eb66884e9d37bbf1a661a83d827768deb942b664 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2689,9 +2689,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.");