core: disable the effect of Restart= if there's a stop job pending for a service...

We shouldn't undo the job already enqueued, under any circumstances.

Fixes: #6504

diff --git a/src/core/service.c b/src/core/service.c
index f43f13e..004e2a7 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1498,8 +1498,14 @@ static bool service_will_restart(Service *s) {
 
 static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart) {
         int r;
+
         assert(s);
 
+        /* If there's a stop job queued before we enter the DEAD state, we shouldn't act on Restart=, in order to not
+         * undo what has already been enqueued. */
+        if (unit_stop_pending(UNIT(s)))
+                allow_restart = false;
+
         if (s->result == SERVICE_SUCCESS)
                 s->result = f;