You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.1 KiB
31 lines
1.1 KiB
4 years ago
|
From df8adf9c8a8258ae041db28f4bf411da6156170a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Wed, 22 Apr 2020 20:34:02 +0200
|
||
|
|
Subject: [PATCH] core: make sure to restore the control command id, too
|
||
|
|
|
||
|
|
Fixes: #15356
|
||
|
|
(cherry picked from commit e9da62b18af647bfa73807e1c7fc3bfa4bb4b2ac)
|
||
|
|
|
||
|
|
Resolves: #1828953
|
||
|
|
---
|
||
|
|
src/core/service.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/service.c b/src/core/service.c
|
||
|
|
index dd0ae7cb88..4c73b6ef96 100644
|
||
|
|
--- a/src/core/service.c
|
||
|
|
+++ b/src/core/service.c
|
||
|
|
@@ -2263,9 +2263,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->id, "Current command vanished from the unit file, execution of the command list won't be resumed.");
|