diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-04-22 20:34:02 +0200 |
|---|---|---|
| committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2020-08-27 13:55:18 +0200 |
| commit | 37f2576684d7494c916fd1f13275982f3c43f44f (patch) | |
| tree | 9924fc79114587b767160f7f81b00dc7a28ab441 | |
| parent | 8ad89170001c9aba8849630ddb5da81d9e24a1bc (diff) | |
| download | systemd-37f2576684d7494c916fd1f13275982f3c43f44f.tar.gz | |
core: make sure to restore the control command id, toov239-40
Fixes: #15356
(cherry picked from commit e9da62b18af647bfa73807e1c7fc3bfa4bb4b2ac)
Resolves: #1829867
| -rw-r--r-- | src/core/service.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/service.c b/src/core/service.c index 89b41f6783..7cff419e4e 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -2703,9 +2703,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."); |