From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 29 Mar 2023 19:41:31 +0000 (+0200)
Subject: Merge pull request #26971 from poettering/autostart-dead-failed
X-Git-Tag: v254-rc1~873
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e34aed32b7c02e54642b3a84948d774528148d7;p=thirdparty%2Fsystemd.git

Merge pull request #26971 from poettering/autostart-dead-failed

pid1: introduce new SERVICE_{DEAD|FAILED}_BEFORE_AUTO_RESTART service…
---

2e34aed32b7c02e54642b3a84948d774528148d7
diff --cc src/core/service.c
index 115d3fbef5f,c54738a15f4..d73feb363e1
--- a/src/core/service.c
+++ b/src/core/service.c
@@@ -1312,8 -1324,12 +1322,11 @@@ static int service_coldplug(Unit *u) 
                          return r;
          }
  
-         if (!IN_SET(s->deserialized_state, SERVICE_DEAD, SERVICE_FAILED, SERVICE_AUTO_RESTART, SERVICE_CLEANING)) {
+         if (!IN_SET(s->deserialized_state,
+                     SERVICE_DEAD, SERVICE_FAILED,
+                     SERVICE_DEAD_BEFORE_AUTO_RESTART, SERVICE_FAILED_BEFORE_AUTO_RESTART, SERVICE_AUTO_RESTART,
+                     SERVICE_CLEANING)) {
                  (void) unit_enqueue_rewatch_pids(u);
 -                (void) unit_setup_dynamic_creds(u);
                  (void) unit_setup_exec_runtime(u);
          }