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

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

diff --cc src/core/service.c
index 115d3fbef5fa3c4c2b7caa005178bc143646ffc4,c54738a15f4b0377fa6a3de728dab4ab8f5afcbe..d73feb363e10f2644b874e2fa14ec9455e330323
--- 1/src/core/service.c
--- 2/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);
          }
  

diff --cc src/core/service.h
Simple merge

diff --cc src/core/socket.c
Simple merge