diff --git a/daemons/pacemakerd/pcmkd_subdaemons.c b/daemons/pacemakerd/pcmkd_subdaemons.c
index 6daabcd097..5ead43f3c1 100644
--- a/daemons/pacemakerd/pcmkd_subdaemons.c
+++ b/daemons/pacemakerd/pcmkd_subdaemons.c
@@ -1,888 +1,875 @@
 /*
  * Copyright 2010-2024 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
  * This source code is licensed under the GNU General Public License version 2
  * or later (GPLv2+) WITHOUT ANY WARRANTY.
  */
 
 #include <crm_internal.h>
 #include "pacemakerd.h"
 
 #if SUPPORT_COROSYNC
 #include "pcmkd_corosync.h"
 #endif
 
 #include <errno.h>
 #include <grp.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 
 #include <crm/cluster.h>
 #include <crm/common/xml.h>
 
 enum child_daemon_flags {
     child_none                  = 0,
     child_respawn               = 1 << 0,
     child_needs_cluster         = 1 << 1,
     child_needs_retry           = 1 << 2,
     child_active_before_startup = 1 << 3,
 };
 
 typedef struct pcmk_child_s {
     pid_t pid;
     int respawn_count;
     const char *name;
     const char *uid;
     const char *command;
     const char *endpoint;  /* IPC server name */
     int check_count;
     uint32_t flags;
 } pcmk_child_t;
 
 #define PCMK_PROCESS_CHECK_INTERVAL 1
 #define PCMK_PROCESS_CHECK_RETRIES  5
 #define SHUTDOWN_ESCALATION_PERIOD  180000  /* 3m */
 
 /* Index into the array below */
 #define PCMK_CHILD_CONTROLD  5
 
 static pcmk_child_t pcmk_children[] = {
     {
         0, 0, "pacemaker-based", CRM_DAEMON_USER,
         CRM_DAEMON_DIR "/pacemaker-based", PCMK__SERVER_BASED_RO,
         0, child_respawn | child_needs_cluster
     },
     {
         0, 0, "pacemaker-fenced", NULL,
         CRM_DAEMON_DIR "/pacemaker-fenced", "stonith-ng",
         0, child_respawn | child_needs_cluster
     },
     {
         0, 0, "pacemaker-execd", NULL,
         CRM_DAEMON_DIR "/pacemaker-execd", CRM_SYSTEM_LRMD,
         0, child_respawn
     },
     {
         0, 0, "pacemaker-attrd", CRM_DAEMON_USER,
         CRM_DAEMON_DIR "/pacemaker-attrd", PCMK__VALUE_ATTRD,
         0, child_respawn | child_needs_cluster
     },
     {
         0, 0, "pacemaker-schedulerd", CRM_DAEMON_USER,
         CRM_DAEMON_DIR "/pacemaker-schedulerd", CRM_SYSTEM_PENGINE,
         0, child_respawn
     },
     {
         0, 0, "pacemaker-controld", CRM_DAEMON_USER,
         CRM_DAEMON_DIR "/pacemaker-controld", CRM_SYSTEM_CRMD,
         0, child_respawn | child_needs_cluster
     },
 };
 
 static char *opts_default[] = { NULL, NULL };
 static char *opts_vgrind[] = { NULL, NULL, NULL, NULL, NULL };
 
 crm_trigger_t *shutdown_trigger = NULL;
 crm_trigger_t *startup_trigger = NULL;
 time_t subdaemon_check_progress = 0;
 
 // Whether we need root group access to talk to cluster layer
 static bool need_root_group = true;
 
 /* When contacted via pacemakerd-api by a client having sbd in
  * the name we assume it is sbd-daemon which wants to know
  * if pacemakerd shutdown gracefully.
  * Thus when everything is shutdown properly pacemakerd
  * waits till it has reported the graceful completion of
  * shutdown to sbd and just when sbd-client closes the
  * connection we can assume that the report has arrived
  * properly so that pacemakerd can finally exit.
  * Following two variables are used to track that handshake.
  */
 unsigned int shutdown_complete_state_reported_to = 0;
 gboolean shutdown_complete_state_reported_client_closed = FALSE;
 
 /* state we report when asked via pacemakerd-api status-ping */
 const char *pacemakerd_state = PCMK__VALUE_INIT;
 gboolean running_with_sbd = FALSE; /* local copy */
 
 GMainLoop *mainloop = NULL;
 
 static gboolean fatal_error = FALSE;
 
 static int child_liveness(pcmk_child_t *child);
 static gboolean escalate_shutdown(gpointer data);
 static int start_child(pcmk_child_t * child);
 static void pcmk_child_exit(mainloop_child_t * p, pid_t pid, int core, int signo, int exitcode);
 static void pcmk_process_exit(pcmk_child_t * child);
 static gboolean pcmk_shutdown_worker(gpointer user_data);
 static gboolean stop_child(pcmk_child_t * child, int signal);
 
 static bool
 pcmkd_cluster_connected(void)
 {
 #if SUPPORT_COROSYNC
     return pcmkd_corosync_connected();
 #else
     return true;
 #endif
 }
 
 static gboolean
 check_next_subdaemon(gpointer user_data)
 {
     static int next_child = 0;
 
     pcmk_child_t *child = &(pcmk_children[next_child]);
     const long long pid = PCMK__SPECIAL_PID_AS_0(child->pid);
     int rc = child_liveness(child);
 
     crm_trace("Checked %s[%lld]: %s (%d)",
               child->name, pid, pcmk_rc_str(rc), rc);
 
     switch (rc) {
         case pcmk_rc_ok:
             child->check_count = 0;
             subdaemon_check_progress = time(NULL);
             break;
 
         case pcmk_rc_ipc_pid_only: // Child was previously OK
             if (++(child->check_count) >= PCMK_PROCESS_CHECK_RETRIES) {
                 crm_crit("%s[%lld] is unresponsive to IPC after %d attempt%s "
                          "and will now be killed",
                          child->name, pid, child->check_count,
                          pcmk__plural_s(child->check_count));
                 stop_child(child, SIGKILL);
                 if (pcmk_is_set(child->flags, child_respawn)) {
                     // Respawn limit hasn't been reached, so retry another round
                     child->check_count = 0;
                 }
             } else {
                 crm_notice("%s[%lld] is unresponsive to IPC after %d attempt%s",
                            child->name, pid, child->check_count,
                            pcmk__plural_s(child->check_count));
                 if (pcmk_is_set(child->flags, child_respawn)) {
                     /* as long as the respawn-limit isn't reached
                        and we haven't run out of connect retries
                        we account this as progress we are willing
                        to tell to sbd
                      */
                     subdaemon_check_progress = time(NULL);
                 }
             }
             /* go to the next child and see if
                we can make progress there
              */
             break;
         case pcmk_rc_ipc_unresponsive:
             if (!pcmk_is_set(child->flags, child_respawn)) {
                 /* if a subdaemon is down and we don't want it
                    to be restarted this is a success during
                    shutdown. if it isn't restarted anymore
                    due to MAX_RESPAWN it is
                    rather no success.
                  */
                 if (child->respawn_count <= MAX_RESPAWN) {
                     subdaemon_check_progress = time(NULL);
                 }
             }
             if (!pcmk_is_set(child->flags, child_active_before_startup)) {
                 crm_trace("%s[%lld] terminated (relying on SIGCHLD handler)",
                           child->name, pid);
                 break;
             }
             if (pcmk_is_set(child->flags, child_respawn)) {
                 crm_err("%s[%lld] terminated", child->name, pid);
             } else {
                 /* orderly shutdown */
                 crm_notice("%s[%lld] terminated", child->name, pid);
             }
             pcmk_process_exit(child);
             break;
         default:
             crm_exit(CRM_EX_FATAL);
             break;  /* static analysis/noreturn */
     }
 
     if (++next_child >= PCMK__NELEM(pcmk_children)) {
         next_child = 0;
     }
 
     return G_SOURCE_CONTINUE;
 }
 
 static gboolean
 escalate_shutdown(gpointer data)
 {
     pcmk_child_t *child = data;
 
     if (child->pid == PCMK__SPECIAL_PID) {
         pcmk_process_exit(child);
 
     } else if (child->pid != 0) {
         /* Use SIGSEGV instead of SIGKILL to create a core so we can see what it was up to */
         crm_err("Child %s not terminating in a timely manner, forcing", child->name);
         stop_child(child, SIGSEGV);
     }
     return FALSE;
 }
 
 static void
 pcmk_child_exit(mainloop_child_t * p, pid_t pid, int core, int signo, int exitcode)
 {
     pcmk_child_t *child = mainloop_child_userdata(p);
     const char *name = mainloop_child_name(p);
 
     if (signo) {
         do_crm_log(((signo == SIGKILL)? LOG_WARNING : LOG_ERR),
                    "%s[%d] terminated with signal %d (%s)%s",
                    name, pid, signo, strsignal(signo),
                    (core? " and dumped core" : ""));
 
     } else {
         switch(exitcode) {
             case CRM_EX_OK:
                 crm_info("%s[%d] exited with status %d (%s)",
                          name, pid, exitcode, crm_exit_str(exitcode));
                 break;
 
             case CRM_EX_FATAL:
                 crm_warn("Shutting cluster down because %s[%d] had fatal failure",
                          name, pid);
                 child->flags &= ~child_respawn;
                 fatal_error = TRUE;
                 pcmk_shutdown(SIGTERM);
                 break;
 
             case CRM_EX_PANIC:
                 crm_emerg("%s[%d] instructed the machine to reset", name, pid);
                 child->flags &= ~child_respawn;
                 fatal_error = TRUE;
                 pcmk__panic(__func__);
                 pcmk_shutdown(SIGTERM);
                 break;
 
             default:
                 crm_err("%s[%d] exited with status %d (%s)",
                         name, pid, exitcode, crm_exit_str(exitcode));
                 break;
         }
     }
 
     pcmk_process_exit(child);
 }
 
 static void
 pcmk_process_exit(pcmk_child_t * child)
 {
     child->pid = 0;
     child->flags &= ~child_active_before_startup;
     child->check_count = 0;
 
     child->respawn_count += 1;
     if (child->respawn_count > MAX_RESPAWN) {
         crm_err("Child respawn count exceeded by %s", child->name);
         child->flags &= ~child_respawn;
     }
 
     if (shutdown_trigger) {
         /* resume step-wise shutdown (returned TRUE yields no parallelizing) */
         mainloop_set_trigger(shutdown_trigger);
 
     } else if (!pcmk_is_set(child->flags, child_respawn)) {
         /* nothing to do */
 
     } else if (crm_is_true(pcmk__env_option(PCMK__ENV_FAIL_FAST))) {
         crm_err("Rebooting system because of %s", child->name);
         pcmk__panic(__func__);
 
     } else if (child_liveness(child) == pcmk_rc_ok) {
         crm_warn("One-off suppressing strict respawning of a child process %s,"
                  " appears alright per %s IPC end-point",
                  child->name, child->endpoint);
 
     } else if (pcmk_is_set(child->flags, child_needs_cluster) && !pcmkd_cluster_connected()) {
         crm_notice("Not respawning %s subdaemon until cluster returns",
                    child->name);
         child->flags |= child_needs_retry;
 
     } else {
         crm_notice("Respawning %s subdaemon after unexpected exit",
                    child->name);
         start_child(child);
     }
 }
 
 static gboolean
 pcmk_shutdown_worker(gpointer user_data)
 {
     static int phase = PCMK__NELEM(pcmk_children) - 1;
     static time_t next_log = 0;
 
     if (phase == PCMK__NELEM(pcmk_children) - 1) {
         crm_notice("Shutting down Pacemaker");
         pacemakerd_state = PCMK__VALUE_SHUTTING_DOWN;
     }
 
     for (; phase >= 0; phase--) {
         pcmk_child_t *child = &(pcmk_children[phase]);
 
         if (child->pid != 0) {
             time_t now = time(NULL);
 
             if (pcmk_is_set(child->flags, child_respawn)) {
                 if (child->pid == PCMK__SPECIAL_PID) {
                     crm_warn("The process behind %s IPC cannot be"
                              " terminated, so either wait the graceful"
                              " period of %ld s for its native termination"
                              " if it vitally depends on some other daemons"
                              " going down in a controlled way already,"
                              " or locate and kill the correct %s process"
                              " on your own; set PCMK_" PCMK__ENV_FAIL_FAST "=1"
                              " to avoid this altogether next time around",
                              child->name, (long) SHUTDOWN_ESCALATION_PERIOD,
                              child->command);
                 }
                 next_log = now + 30;
                 child->flags &= ~child_respawn;
                 stop_child(child, SIGTERM);
                 if (phase < PCMK_CHILD_CONTROLD) {
                     g_timeout_add(SHUTDOWN_ESCALATION_PERIOD,
                                   escalate_shutdown, child);
                 }
 
             } else if (now >= next_log) {
                 next_log = now + 30;
                 crm_notice("Still waiting for %s to terminate "
                            QB_XS " pid=%lld",
                            child->name, (long long) child->pid);
             }
             return TRUE;
         }
 
         /* cleanup */
         crm_debug("%s confirmed stopped", child->name);
         child->pid = 0;
     }
 
     crm_notice("Shutdown complete");
     pacemakerd_state = PCMK__VALUE_SHUTDOWN_COMPLETE;
     if (!fatal_error && running_with_sbd &&
         pcmk__get_sbd_sync_resource_startup() &&
         !shutdown_complete_state_reported_client_closed) {
         crm_notice("Waiting for SBD to pick up shutdown-complete-state.");
         return TRUE;
     }
 
-    // @COMPAT Drop shutdown delay at 3.0.0
-    {
-        const char *delay = pcmk__env_option(PCMK__ENV_SHUTDOWN_DELAY);
-        if(delay) {
-            long long delay_ms = crm_get_msec(delay);
-
-            sync();
-            if (delay_ms > 0) {
-                pcmk__sleep_ms((unsigned int) QB_MIN(delay_ms, UINT_MAX));
-            }
-        }
-    }
-
     g_main_loop_quit(mainloop);
 
     if (fatal_error) {
         crm_notice("Shutting down and staying down after fatal error");
 #ifdef SUPPORT_COROSYNC
         pcmkd_shutdown_corosync();
 #endif
         crm_exit(CRM_EX_FATAL);
     }
 
     return TRUE;
 }
 
 /* TODO once libqb is taught to juggle with IPC end-points carried over as
         bare file descriptor (https://github.com/ClusterLabs/libqb/issues/325)
         it shall hand over these descriptors here if/once they are successfully
         pre-opened in (presumably) child_liveness(), to avoid any remaining
         room for races */
  // \return Standard Pacemaker return code
 static int
 start_child(pcmk_child_t * child)
 {
     uid_t uid = 0;
     gid_t gid = 0;
     gboolean use_valgrind = FALSE;
     gboolean use_callgrind = FALSE;
     const char *env_valgrind = pcmk__env_option(PCMK__ENV_VALGRIND_ENABLED);
     const char *env_callgrind = pcmk__env_option(PCMK__ENV_CALLGRIND_ENABLED);
 
     child->flags &= ~child_active_before_startup;
     child->check_count = 0;
 
     if (child->command == NULL) {
         crm_info("Nothing to do for child \"%s\"", child->name);
         return pcmk_rc_ok;
     }
 
     if (env_callgrind != NULL && crm_is_true(env_callgrind)) {
         use_callgrind = TRUE;
         use_valgrind = TRUE;
 
     } else if (env_callgrind != NULL && strstr(env_callgrind, child->name)) {
         use_callgrind = TRUE;
         use_valgrind = TRUE;
 
     } else if (env_valgrind != NULL && crm_is_true(env_valgrind)) {
         use_valgrind = TRUE;
 
     } else if (env_valgrind != NULL && strstr(env_valgrind, child->name)) {
         use_valgrind = TRUE;
     }
 
     if (use_valgrind && strlen(VALGRIND_BIN) == 0) {
         crm_warn("Cannot enable valgrind for %s:"
                  " The location of the valgrind binary is unknown", child->name);
         use_valgrind = FALSE;
     }
 
     if (child->uid) {
         if (crm_user_lookup(child->uid, &uid, &gid) < 0) {
             crm_err("Invalid user (%s) for %s: not found", child->uid, child->name);
             return EACCES;
         }
         crm_info("Using uid=%u and group=%u for process %s", uid, gid, child->name);
     }
 
     child->pid = fork();
     CRM_ASSERT(child->pid != -1);
 
     if (child->pid > 0) {
         /* parent */
         mainloop_child_add(child->pid, 0, child->name, child, pcmk_child_exit);
 
         crm_info("Forked child %lld for process %s%s",
                  (long long) child->pid, child->name,
                  use_valgrind ? " (valgrind enabled: " VALGRIND_BIN ")" : "");
         return pcmk_rc_ok;
 
     } else {
         /* Start a new session */
         (void)setsid();
 
         /* Setup the two alternate arg arrays */
         opts_vgrind[0] = pcmk__str_copy(VALGRIND_BIN);
         if (use_callgrind) {
             opts_vgrind[1] = pcmk__str_copy("--tool=callgrind");
             opts_vgrind[2] = pcmk__str_copy("--callgrind-out-file="
                                             CRM_STATE_DIR "/callgrind.out.%p");
             opts_vgrind[3] = pcmk__str_copy(child->command);
             opts_vgrind[4] = NULL;
         } else {
             opts_vgrind[1] = pcmk__str_copy(child->command);
             opts_vgrind[2] = NULL;
             opts_vgrind[3] = NULL;
             opts_vgrind[4] = NULL;
         }
         opts_default[0] = pcmk__str_copy(child->command);
 
         if(gid) {
             // Drop root group access if not needed
             if (!need_root_group && (setgid(gid) < 0)) {
                 crm_warn("Could not set group to %d: %s", gid, strerror(errno));
             }
 
             /* Initialize supplementary groups to only those always granted to
              * the user, plus haclient (so we can access IPC).
              */
             if (initgroups(child->uid, gid) < 0) {
                 crm_err("Cannot initialize groups for %s: %s (%d)",
                         child->uid, pcmk_rc_str(errno), errno);
             }
         }
 
         if (uid && setuid(uid) < 0) {
             crm_warn("Could not set user to %s (id %d): %s",
                      child->uid, uid, strerror(errno));
         }
 
         pcmk__close_fds_in_child(true);
 
         pcmk__open_devnull(O_RDONLY);   // stdin (fd 0)
         pcmk__open_devnull(O_WRONLY);   // stdout (fd 1)
         pcmk__open_devnull(O_WRONLY);   // stderr (fd 2)
 
         if (use_valgrind) {
             (void)execvp(VALGRIND_BIN, opts_vgrind);
         } else {
             (void)execvp(child->command, opts_default);
         }
         crm_crit("Could not execute %s: %s", child->command, strerror(errno));
         crm_exit(CRM_EX_FATAL);
     }
     return pcmk_rc_ok;          /* never reached */
 }
 
 /*!
  * \internal
  * \brief Check the liveness of the child based on IPC name and PID if tracked
  *
  * \param[in,out] child  Child tracked data
  *
  * \return Standard Pacemaker return code
  *
  * \note Return codes of particular interest include pcmk_rc_ipc_unresponsive
  *       indicating that no trace of IPC liveness was detected,
  *       pcmk_rc_ipc_unauthorized indicating that the IPC endpoint is blocked by
  *       an unauthorized process, and pcmk_rc_ipc_pid_only indicating that
  *       the child is up by PID but not IPC end-point (possibly starting).
  * \note This function doesn't modify any of \p child members but \c pid,
  *       and is not actively toying with processes as such but invoking
  *       \c stop_child in one particular case (there's for some reason
  *       a different authentic holder of the IPC end-point).
  */
 static int
 child_liveness(pcmk_child_t *child)
 {
     uid_t cl_uid = 0;
     gid_t cl_gid = 0;
     const uid_t root_uid = 0;
     const gid_t root_gid = 0;
     const uid_t *ref_uid;
     const gid_t *ref_gid;
     int rc = pcmk_rc_ipc_unresponsive;
     pid_t ipc_pid = 0;
 
     if (child->endpoint == NULL
             && (child->pid <= 0 || child->pid == PCMK__SPECIAL_PID)) {
         crm_err("Cannot track child %s for missing both API end-point and PID",
                 child->name);
         rc = EINVAL; // Misuse of function when child is not trackable
 
     } else if (child->endpoint != NULL) {
         int legacy_rc = pcmk_ok;
 
         if (child->uid == NULL) {
             ref_uid = &root_uid;
             ref_gid = &root_gid;
         } else {
             ref_uid = &cl_uid;
             ref_gid = &cl_gid;
             legacy_rc = pcmk_daemon_user(&cl_uid, &cl_gid);
         }
 
         if (legacy_rc < 0) {
             rc = pcmk_legacy2rc(legacy_rc);
             crm_err("Could not find user and group IDs for user %s: %s "
                     QB_XS " rc=%d", CRM_DAEMON_USER, pcmk_rc_str(rc), rc);
         } else {
             rc = pcmk__ipc_is_authentic_process_active(child->endpoint,
                                                        *ref_uid, *ref_gid,
                                                        &ipc_pid);
             if ((rc == pcmk_rc_ok) || (rc == pcmk_rc_ipc_unresponsive)) {
                 if (child->pid <= 0) {
                     /* If rc is pcmk_rc_ok, ipc_pid is nonzero and this
                      * initializes a new child. If rc is
                      * pcmk_rc_ipc_unresponsive, ipc_pid is zero, and we will
                      * investigate further.
                      */
                     child->pid = ipc_pid;
                 } else if ((ipc_pid != 0) && (child->pid != ipc_pid)) {
                     /* An unexpected (but authorized) process is responding to
                      * IPC. Investigate further.
                      */
                     rc = pcmk_rc_ipc_unresponsive;
                 }
             }
         }
     }
 
     if (rc == pcmk_rc_ipc_unresponsive) {
         /* If we get here, a child without IPC is being tracked, no IPC liveness
          * has been detected, or IPC liveness has been detected with an
          * unexpected (but authorized) process. This is safe on FreeBSD since
          * the only change possible from a proper child's PID into "special" PID
          * of 1 behind more loosely related process.
          */
         int ret = pcmk__pid_active(child->pid, child->name);
 
         if (ipc_pid && ((ret != pcmk_rc_ok)
                         || ipc_pid == PCMK__SPECIAL_PID
                         || (pcmk__pid_active(ipc_pid,
                                              child->name) == pcmk_rc_ok))) {
             /* An unexpected (but authorized) process was detected at the IPC
              * endpoint, and either it is active, or the child we're tracking is
              * not.
              */
 
             if (ret == pcmk_rc_ok) {
                 /* The child we're tracking is active. Kill it, and adopt the
                  * detected process. This assumes that our children don't fork
                  * (thus getting a different PID owning the IPC), but rather the
                  * tracking got out of sync because of some means external to
                  * Pacemaker, and adopting the detected process is better than
                  * killing it and possibly having to spawn a new child.
                  */
                 /* not possessing IPC, afterall (what about corosync CPG?) */
                 stop_child(child, SIGKILL);
             }
             rc = pcmk_rc_ok;
             child->pid = ipc_pid;
         } else if (ret == pcmk_rc_ok) {
             // Our tracked child's PID was found active, but not its IPC
             rc = pcmk_rc_ipc_pid_only;
         } else if ((child->pid == 0) && (ret == EINVAL)) {
             // FreeBSD can return EINVAL
             rc = pcmk_rc_ipc_unresponsive;
         } else {
             switch (ret) {
                 case EACCES:
                     rc = pcmk_rc_ipc_unauthorized;
                     break;
                 case ESRCH:
                     rc = pcmk_rc_ipc_unresponsive;
                     break;
                 default:
                     rc = ret;
                     break;
             }
         }
     }
     return rc;
 }
 
 /*!
  * \internal
  * \brief Initial one-off check of the pre-existing "child" processes
  *
  * With "child" process, we mean the subdaemon that defines an API end-point
  * (all of them do as of the comment) -- the possible complement is skipped
  * as it is deemed it has no such shared resources to cause conflicts about,
  * hence it can presumably be started anew without hesitation.
  * If that won't hold true in the future, the concept of a shared resource
  * will have to be generalized beyond the API end-point.
  *
  * For boundary cases that the "child" is still starting (IPC end-point is yet
  * to be witnessed), or more rarely (practically FreeBSD only), when there's
  * a pre-existing "untrackable" authentic process, we give the situation some
  * time to possibly unfold in the right direction, meaning that said socket
  * will appear or the unattainable process will disappear per the observable
  * IPC, respectively.
  *
  * \return Standard Pacemaker return code
  *
  * \note Since this gets run at the very start, \c respawn_count fields
  *       for particular children get temporarily overloaded with "rounds
  *       of waiting" tracking, restored once we are about to finish with
  *       success (i.e. returning value >=0) and will remain unrestored
  *       otherwise.  One way to suppress liveness detection logic for
  *       particular child is to set the said value to a negative number.
  */
 #define WAIT_TRIES 4  /* together with interleaved sleeps, worst case ~ 1s */
 int
 find_and_track_existing_processes(void)
 {
     bool wait_in_progress;
     int rc;
     size_t i, rounds;
 
     for (rounds = 1; rounds <= WAIT_TRIES; rounds++) {
         wait_in_progress = false;
         for (i = 0; i < PCMK__NELEM(pcmk_children); i++) {
 
             if ((pcmk_children[i].endpoint == NULL)
                 || (pcmk_children[i].respawn_count < 0)) {
                 continue;
             }
 
             rc = child_liveness(&pcmk_children[i]);
             if (rc == pcmk_rc_ipc_unresponsive) {
                 /* As a speculation, don't give up if there are more rounds to
                  * come for other reasons, but don't artificially wait just
                  * because of this, since we would preferably start ASAP.
                  */
                 continue;
             }
 
             // @TODO Functionize more of this to reduce nesting
             pcmk_children[i].respawn_count = rounds;
             switch (rc) {
                 case pcmk_rc_ok:
                     if (pcmk_children[i].pid == PCMK__SPECIAL_PID) {
                         if (crm_is_true(pcmk__env_option(PCMK__ENV_FAIL_FAST))) {
                             crm_crit("Cannot reliably track pre-existing"
                                      " authentic process behind %s IPC on this"
                                      " platform and PCMK_" PCMK__ENV_FAIL_FAST
                                      " requested",
                                      pcmk_children[i].endpoint);
                             return EOPNOTSUPP;
                         } else if (pcmk_children[i].respawn_count == WAIT_TRIES) {
                             crm_notice("Assuming pre-existing authentic, though"
                                        " on this platform untrackable, process"
                                        " behind %s IPC is stable (was in %d"
                                        " previous samples) so rather than"
                                        " bailing out (PCMK_" PCMK__ENV_FAIL_FAST
                                        " not requested), we just switch to a"
                                        " less optimal IPC liveness monitoring"
                                        " (not very suitable for heavy load)",
                                        pcmk_children[i].name, WAIT_TRIES - 1);
                             crm_warn("The process behind %s IPC cannot be"
                                      " terminated, so the overall shutdown"
                                      " will get delayed implicitly (%ld s),"
                                      " which serves as a graceful period for"
                                      " its native termination if it vitally"
                                      " depends on some other daemons going"
                                      " down in a controlled way already",
                                      pcmk_children[i].name,
                                      (long) SHUTDOWN_ESCALATION_PERIOD);
                         } else {
                             wait_in_progress = true;
                             crm_warn("Cannot reliably track pre-existing"
                                      " authentic process behind %s IPC on this"
                                      " platform, can still disappear in %d"
                                      " attempt(s)", pcmk_children[i].endpoint,
                                      WAIT_TRIES - pcmk_children[i].respawn_count);
                             continue;
                         }
                     }
                     crm_notice("Tracking existing %s process (pid=%lld)",
                                pcmk_children[i].name,
                                (long long) PCMK__SPECIAL_PID_AS_0(
                                                pcmk_children[i].pid));
                     pcmk_children[i].respawn_count = -1;  /* 0~keep watching */
                     pcmk_children[i].flags |= child_active_before_startup;
                     break;
                 case pcmk_rc_ipc_pid_only:
                     if (pcmk_children[i].respawn_count == WAIT_TRIES) {
                         crm_crit("%s IPC end-point for existing authentic"
                                  " process %lld did not (re)appear",
                                  pcmk_children[i].endpoint,
                                  (long long) PCMK__SPECIAL_PID_AS_0(
                                                  pcmk_children[i].pid));
                         return rc;
                     }
                     wait_in_progress = true;
                     crm_warn("Cannot find %s IPC end-point for existing"
                              " authentic process %lld, can still (re)appear"
                              " in %d attempts (?)",
                              pcmk_children[i].endpoint,
                              (long long) PCMK__SPECIAL_PID_AS_0(
                                              pcmk_children[i].pid),
                              WAIT_TRIES - pcmk_children[i].respawn_count);
                     continue;
                 default:
                     crm_crit("Checked liveness of %s: %s " QB_XS " rc=%d",
                              pcmk_children[i].name, pcmk_rc_str(rc), rc);
                     return rc;
             }
         }
         if (!wait_in_progress) {
             break;
         }
         pcmk__sleep_ms(250); // Wait a bit for changes to possibly happen
     }
     for (i = 0; i < PCMK__NELEM(pcmk_children); i++) {
         pcmk_children[i].respawn_count = 0;  /* restore pristine state */
     }
 
     g_timeout_add_seconds(PCMK_PROCESS_CHECK_INTERVAL, check_next_subdaemon,
                           NULL);
     return pcmk_rc_ok;
 }
 
 gboolean
 init_children_processes(void *user_data)
 {
     if (pcmk_get_cluster_layer() == pcmk_cluster_layer_corosync) {
         /* Corosync clusters can drop root group access, because we set
          * uidgid.gid.${gid}=1 via CMAP, which allows these processes to connect
          * to corosync.
          */
         need_root_group = false;
     }
 
     /* start any children that have not been detected */
     for (int i = 0; i < PCMK__NELEM(pcmk_children); i++) {
         if (pcmk_children[i].pid != 0) {
             /* we are already tracking it */
             continue;
         }
 
         start_child(&(pcmk_children[i]));
     }
 
     /* From this point on, any daemons being started will be due to
      * respawning rather than node start.
      *
      * This may be useful for the daemons to know
      */
     pcmk__set_env_option(PCMK__ENV_RESPAWNED, PCMK_VALUE_TRUE, false);
     pacemakerd_state = PCMK__VALUE_RUNNING;
     return TRUE;
 }
 
 void
 pcmk_shutdown(int nsig)
 {
     if (shutdown_trigger == NULL) {
         shutdown_trigger = mainloop_add_trigger(G_PRIORITY_HIGH, pcmk_shutdown_worker, NULL);
     }
     mainloop_set_trigger(shutdown_trigger);
 }
 
 void
 restart_cluster_subdaemons(void)
 {
     for (int i = 0; i < PCMK__NELEM(pcmk_children); i++) {
         if (!pcmk_is_set(pcmk_children[i].flags, child_needs_retry) || pcmk_children[i].pid != 0) {
             continue;
         }
 
         crm_notice("Respawning cluster-based subdaemon: %s", pcmk_children[i].name);
         if (start_child(&pcmk_children[i])) {
             pcmk_children[i].flags &= ~child_needs_retry;
         }
     }
 }
 
 static gboolean
 stop_child(pcmk_child_t * child, int signal)
 {
     if (signal == 0) {
         signal = SIGTERM;
     }
 
     /* why to skip PID of 1?
        - FreeBSD ~ how untrackable process behind IPC is masqueraded as
        - elsewhere: how "init" task is designated; in particular, in systemd
          arrangement of socket-based activation, this is pretty real */
     if (child->command == NULL || child->pid == PCMK__SPECIAL_PID) {
         crm_debug("Nothing to do for child \"%s\" (process %lld)",
                   child->name, (long long) PCMK__SPECIAL_PID_AS_0(child->pid));
         return TRUE;
     }
 
     if (child->pid <= 0) {
         crm_trace("Client %s not running", child->name);
         return TRUE;
     }
 
     errno = 0;
     if (kill(child->pid, signal) == 0) {
         crm_notice("Stopping %s " QB_XS " sent signal %d to process %lld",
                    child->name, signal, (long long) child->pid);
 
     } else {
         crm_err("Could not stop %s (process %lld) with signal %d: %s",
                 child->name, (long long) child->pid, signal, strerror(errno));
     }
 
     return TRUE;
 }
 
diff --git a/include/crm/common/options_internal.h b/include/crm/common/options_internal.h
index 1ad971fdba..520fec4b91 100644
--- a/include/crm/common/options_internal.h
+++ b/include/crm/common/options_internal.h
@@ -1,256 +1,251 @@
 /*
  * Copyright 2006-2024 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
  * This source code is licensed under the GNU Lesser General Public License
  * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
  */
 
 #ifndef PCMK__CRM_COMMON_OPTIONS_INTERNAL__H
 #define PCMK__CRM_COMMON_OPTIONS_INTERNAL__H
 
 #ifndef PCMK__CONFIG_H
 #define PCMK__CONFIG_H
 #include <config.h>   // _Noreturn
 #endif
 
 #include <glib.h>     // GHashTable
 #include <stdbool.h>  // bool
 
 #include <crm/common/util.h>                // pcmk_parse_interval_spec()
 #include <crm/common/output_internal.h>     // pcmk__output_t
 
 _Noreturn void pcmk__cli_help(char cmd);
 
 
 /*
  * Environment variable option handling
  */
 
 const char *pcmk__env_option(const char *option);
 void pcmk__set_env_option(const char *option, const char *value, bool compat);
 bool pcmk__env_option_enabled(const char *daemon, const char *option);
 
 
 /*
  * Cluster option handling
  */
 
 /*!
  * \internal
  * \enum pcmk__opt_flags
  * \brief Option flags
  */
 enum pcmk__opt_flags {
     pcmk__opt_none       = 0U,          //!< No additional information
 
     /*!
      * \brief In CIB manager metadata
      *
      * \deprecated This flag will be removed with CIB manager metadata
      */
     pcmk__opt_based      = (1U << 0),
 
     /*!
      * \brief In controller metadata
      *
      * \deprecated This flag will be removed with controller metadata
      */
     pcmk__opt_controld   = (1U << 1),
 
     /*!
      * \brief In scheduler metadata
      *
      * \deprecated This flag will be removed with scheduler metadata
      */
     pcmk__opt_schedulerd = (1U << 2),
 
     pcmk__opt_advanced   = (1U << 3),   //!< Advanced use only
     pcmk__opt_generated  = (1U << 4),   //!< Generated by Pacemaker
     pcmk__opt_deprecated = (1U << 5),   //!< Option is deprecated
     pcmk__opt_fencing    = (1U << 6),   //!< Common fencing resource parameter
     pcmk__opt_primitive  = (1U << 7),   //!< Primitive resource meta-attribute
 };
 
 typedef struct pcmk__cluster_option_s {
     const char *name;
     const char *alt_name;
     const char *type;
     const char *values;
     const char *default_value;
 
     bool (*is_valid)(const char *);
 
     uint32_t flags;                 //!< Group of <tt>enum pcmk__opt_flags</tt>
 
     const char *description_short;
     const char *description_long;
 
 } pcmk__cluster_option_t;
 
 const char *pcmk__cluster_option(GHashTable *options, const char *name);
 
 int pcmk__output_cluster_options(pcmk__output_t *out, const char *name,
                                  const char *desc_short, const char *desc_long,
                                  uint32_t filter, bool all);
 int pcmk__output_fencing_params(pcmk__output_t *out, const char *name,
                                 const char *desc_short, const char *desc_long,
                                 bool all);
 int pcmk__output_primitive_meta(pcmk__output_t *out, const char *name,
                                 const char *desc_short, const char *desc_long,
                                 bool all);
 
 int pcmk__daemon_metadata(pcmk__output_t *out, const char *name,
                           const char *short_desc, const char *long_desc,
                           enum pcmk__opt_flags filter);
 
 void pcmk__validate_cluster_options(GHashTable *options);
 
 bool pcmk__valid_interval_spec(const char *value);
 bool pcmk__valid_boolean(const char *value);
 bool pcmk__valid_int(const char *value);
 bool pcmk__valid_positive_int(const char *value);
 bool pcmk__valid_no_quorum_policy(const char *value);
 bool pcmk__valid_percentage(const char *value);
 bool pcmk__valid_placement_strategy(const char *value);
 
 // from watchdog.c
 long pcmk__get_sbd_watchdog_timeout(void);
 bool pcmk__get_sbd_sync_resource_startup(void);
 long pcmk__auto_stonith_watchdog_timeout(void);
 bool pcmk__valid_stonith_watchdog_timeout(const char *value);
 
 // Constants for environment variable names
 #define PCMK__ENV_AUTHKEY_LOCATION          "authkey_location"
 #define PCMK__ENV_BLACKBOX                  "blackbox"
 #define PCMK__ENV_CALLGRIND_ENABLED         "callgrind_enabled"
 #define PCMK__ENV_CLUSTER_TYPE              "cluster_type"
 #define PCMK__ENV_DEBUG                     "debug"
 #define PCMK__ENV_DH_MAX_BITS               "dh_max_bits"
 #define PCMK__ENV_DH_MIN_BITS               "dh_min_bits"
 #define PCMK__ENV_FAIL_FAST                 "fail_fast"
 #define PCMK__ENV_IPC_BUFFER                "ipc_buffer"
 #define PCMK__ENV_IPC_TYPE                  "ipc_type"
 #define PCMK__ENV_LOGFACILITY               "logfacility"
 #define PCMK__ENV_LOGFILE                   "logfile"
 #define PCMK__ENV_LOGFILE_MODE              "logfile_mode"
 #define PCMK__ENV_LOGPRIORITY               "logpriority"
 #define PCMK__ENV_NODE_ACTION_LIMIT         "node_action_limit"
 #define PCMK__ENV_NODE_START_STATE          "node_start_state"
 #define PCMK__ENV_PANIC_ACTION              "panic_action"
 #define PCMK__ENV_REMOTE_ADDRESS            "remote_address"
 #define PCMK__ENV_REMOTE_SCHEMA_DIRECTORY   "remote_schema_directory"
 #define PCMK__ENV_REMOTE_PID1               "remote_pid1"
 #define PCMK__ENV_REMOTE_PORT               "remote_port"
 #define PCMK__ENV_RESPAWNED                 "respawned"
 #define PCMK__ENV_SCHEMA_DIRECTORY          "schema_directory"
 #define PCMK__ENV_SERVICE                   "service"
 #define PCMK__ENV_STDERR                    "stderr"
 #define PCMK__ENV_TLS_PRIORITIES            "tls_priorities"
 #define PCMK__ENV_TRACE_BLACKBOX            "trace_blackbox"
 #define PCMK__ENV_TRACE_FILES               "trace_files"
 #define PCMK__ENV_TRACE_FORMATS             "trace_formats"
 #define PCMK__ENV_TRACE_FUNCTIONS           "trace_functions"
 #define PCMK__ENV_TRACE_TAGS                "trace_tags"
 #define PCMK__ENV_VALGRIND_ENABLED          "valgrind_enabled"
 
-/* @COMPAT Drop at 3.0.0; added to debug shutdown issues when Pacemaker is
- * managed by systemd, but no longer useful.
- */
-#define PCMK__ENV_SHUTDOWN_DELAY            "shutdown_delay"
-
 // @COMPAT Deprecated since 2.1.0
 #define PCMK__OPT_REMOVE_AFTER_STOP         "remove-after-stop"
 
 // Constants for meta-attribute names
 #define PCMK__META_CLONE                    "clone"
 #define PCMK__META_CONTAINER                "container"
 #define PCMK__META_DIGESTS_ALL              "digests-all"
 #define PCMK__META_DIGESTS_SECURE           "digests-secure"
 #define PCMK__META_INTERNAL_RSC             "internal_rsc"
 #define PCMK__META_MIGRATE_SOURCE           "migrate_source"
 #define PCMK__META_MIGRATE_TARGET           "migrate_target"
 #define PCMK__META_ON_NODE                  "on_node"
 #define PCMK__META_ON_NODE_UUID             "on_node_uuid"
 #define PCMK__META_OP_NO_WAIT               "op_no_wait"
 #define PCMK__META_OP_TARGET_RC             "op_target_rc"
 #define PCMK__META_PHYSICAL_HOST            "physical-host"
 #define PCMK__META_STONITH_ACTION           "stonith_action"
 
 /* @TODO Plug these in. Currently, they're never set. These are op attrs for use
  * with https://projects.clusterlabs.org/T382.
  */
 #define PCMK__META_CLEAR_FAILURE_OP         "clear_failure_op"
 #define PCMK__META_CLEAR_FAILURE_INTERVAL   "clear_failure_interval"
 
 // @COMPAT Deprecated meta-attribute since 2.1.0
 #define PCMK__META_CAN_FAIL                 "can_fail"
 
 // @COMPAT Deprecated alias for PCMK__META_PROMOTED_MAX since 2.0.0
 #define PCMK__META_PROMOTED_MAX_LEGACY      "master-max"
 
 // @COMPAT Deprecated alias for PCMK__META_PROMOTED_NODE_MAX since 2.0.0
 #define PCMK__META_PROMOTED_NODE_MAX_LEGACY "master-node-max"
 
 // @COMPAT Deprecated meta-attribute since 2.0.0
 #define PCMK__META_RESTART_TYPE             "restart-type"
 
 // @COMPAT Deprecated meta-attribute since 2.0.0
 #define PCMK__META_ROLE_AFTER_FAILURE       "role_after_failure"
 
 // Constants for enumerated values
 #define PCMK__VALUE_ATTRD                   "attrd"
 #define PCMK__VALUE_BOLD                    "bold"
 #define PCMK__VALUE_BROADCAST               "broadcast"
 #define PCMK__VALUE_CIB                     "cib"
 #define PCMK__VALUE_CIB_DIFF_NOTIFY         "cib_diff_notify"
 #define PCMK__VALUE_CIB_NOTIFY              "cib_notify"
 #define PCMK__VALUE_CIB_POST_NOTIFY         "cib_post_notify"
 #define PCMK__VALUE_CIB_PRE_NOTIFY          "cib_pre_notify"
 #define PCMK__VALUE_CIB_UPDATE_CONFIRMATION "cib_update_confirmation"
 #define PCMK__VALUE_CLUSTER                 "cluster"
 #define PCMK__VALUE_CRMD                    "crmd"
 #define PCMK__VALUE_EN                      "en"
 #define PCMK__VALUE_EPOCH                   "epoch"
 #define PCMK__VALUE_HEALTH_RED              "health_red"
 #define PCMK__VALUE_HEALTH_YELLOW           "health_yellow"
 #define PCMK__VALUE_INIT                    "init"
 #define PCMK__VALUE_LOCAL                   "local"
 #define PCMK__VALUE_LRMD                    "lrmd"
 #define PCMK__VALUE_MAINT                   "maint"
 #define PCMK__VALUE_OUTPUT                  "output"
 #define PCMK__VALUE_PASSWORD                "password"
 #define PCMK__VALUE_PING                    "ping"
 #define PCMK__VALUE_PRIMITIVE               "primitive"
 #define PCMK__VALUE_REFRESH                 "refresh"
 #define PCMK__VALUE_REQUEST                 "request"
 #define PCMK__VALUE_RESPONSE                "response"
 #define PCMK__VALUE_RSC_FAILED              "rsc-failed"
 #define PCMK__VALUE_RSC_FAILURE_IGNORED     "rsc-failure-ignored"
 #define PCMK__VALUE_RSC_MANAGED             "rsc-managed"
 #define PCMK__VALUE_RSC_MULTIPLE            "rsc-multiple"
 #define PCMK__VALUE_RSC_OK                  "rsc-ok"
 #define PCMK__VALUE_RUNNING                 "running"
 #define PCMK__VALUE_SHUTDOWN_COMPLETE       "shutdown_complete"
 #define PCMK__VALUE_SHUTTING_DOWN           "shutting_down"
 #define PCMK__VALUE_ST_ASYNC_TIMEOUT_VALUE  "st-async-timeout-value"
 #define PCMK__VALUE_ST_NOTIFY               "st_notify"
 #define PCMK__VALUE_ST_NOTIFY_DISCONNECT    "st_notify_disconnect"
 #define PCMK__VALUE_ST_NOTIFY_FENCE         "st_notify_fence"
 #define PCMK__VALUE_ST_NOTIFY_HISTORY       "st_notify_history"
 #define PCMK__VALUE_ST_NOTIFY_HISTORY_SYNCED    "st_notify_history_synced"
 #define PCMK__VALUE_STARTING_DAEMONS        "starting_daemons"
 #define PCMK__VALUE_STONITH_NG              "stonith-ng"
 #define PCMK__VALUE_WAIT_FOR_PING           "wait_for_ping"
 #define PCMK__VALUE_WARNING                 "warning"
 
 /* @COMPAT Deprecated since 2.1.7 (used with PCMK__XA_ORDERING attribute of
  * resource sets)
  */
 #define PCMK__VALUE_GROUP                   "group"
 
 // @COMPAT Drop when daemon metadata commands are dropped
 #define PCMK__VALUE_TIME                    "time"
 
 #endif // PCMK__OPTIONS_INTERNAL__H