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.
30 lines
1.1 KiB
30 lines
1.1 KiB
From 714d1c41100be669bd106df9a0efa76e49182e69 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: #1837973 |
|
--- |
|
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 e32cdf4594..df64fbaf60 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.");
|
|
|