richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
17aa40
From c667291303bb876707d86ac3ab9ca62355bae1b3 Mon Sep 17 00:00:00 2001
17aa40
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
17aa40
Date: Tue, 16 Oct 2018 22:45:34 +0200
17aa40
Subject: [PATCH] core: consider service with no start command immediately
17aa40
 started
17aa40
17aa40
The service would always be in state == SERVICE_INACTIVE, but it needs to go
17aa40
through state == SERVICE_START so that SuccessAction/FailureAction are executed.
17aa40
17aa40
(cherry picked from commit ef5ae8e71329e43c277e6d4f983f0c0793047b94)
17aa40
17aa40
Related: #1860899
17aa40
---
17aa40
 src/core/service.c | 6 ++++++
17aa40
 1 file changed, 6 insertions(+)
17aa40
17aa40
diff --git a/src/core/service.c b/src/core/service.c
17aa40
index ae31973774..4da1c5accb 100644
17aa40
--- a/src/core/service.c
17aa40
+++ b/src/core/service.c
17aa40
@@ -2055,6 +2055,12 @@ static void service_enter_start(Service *s) {
17aa40
                         goto fail;
17aa40
                 }
17aa40
 
17aa40
+                /* We force a fake state transition here. Otherwise, the unit would go directly from
17aa40
+                 * SERVICE_DEAD to SERVICE_DEAD without SERVICE_ACTIVATING or SERVICE_ACTIVE
17aa40
+                 * inbetween. This way we can later trigger actions that depend on the state
17aa40
+                 * transition, including SuccessAction=. */
17aa40
+                service_set_state(s, SERVICE_START);
17aa40
+
17aa40
                 service_enter_start_post(s);
17aa40
                 return;
17aa40
         }