diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2022-04-15 21:32:04 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2022-04-25 19:01:09 +0300 |
| commit | 73f936570f85303cc3ee5775f2c2d0f86bf0e60a (patch) | |
| tree | b3a2e3394b70a7fb4251338ae721e973e1bb6fcd /meta-phosphor | |
| parent | bb921fc59bb6934d5b5c53c339299421773d7c68 (diff) | |
| download | openbmc-73f936570f85303cc3ee5775f2c2d0f86bf0e60a.tar.xz | |
host-graceful-quiesce: install new target
Per design here:
https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/52874
phosphor-state-manager: srcrev bump 106152c646..aaa8d3466b
Allen.Wang (1):
phosphor-state-manager: Support multi-host for persist files
Andrew Geissler (1):
host-graceful-quiesce: introduce new target
Tested:
- Built image with new target and included pldmSoftPowerOff.service in
it so that host firmware got a chance to gracefully shut down prior to
Quiesce.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I83cd6a20d72cf586d21baf3fe809aad28f288695
Diffstat (limited to 'meta-phosphor')
| -rw-r--r-- | meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc | 2 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc index df214313f7..718d06d139 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc @@ -8,6 +8,8 @@ DEFAULT_TARGETS = " \ obmc-host-stop@{}.target.wants/phosphor-set-host-transition-to-off@{}.service \ obmc-host-reset@{}.target.requires/phosphor-reset-host-running@{}.service \ obmc-host-stop@{}.target.wants/phosphor-reset-sensor-states@{}.service \ + obmc-host-graceful-quiesce@{}.target.wants/obmc-host-quiesce@{}.target \ + obmc-host-graceful-quiesce@{}.target.wants/pldmSoftPowerOff.service \ obmc-host-quiesce@{}.target.wants/phosphor-reset-sensor-states@{}.service \ obmc-host-shutdown@{}.target.requires/obmc-chassis-poweroff@{}.target \ obmc-host-reboot@{}.target.requires/obmc-host-shutdown@{}.target \ diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 2548720e15..7301b54cc9 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -138,6 +138,7 @@ HOST_SYNCH_TARGETS = "start-pre starting started stop-pre stopping stopped reset # be called by reboot and start target. # - stop: Services to run to shutdown the host # - quiesce: Target to enter on host boot failure +# - graceful-quiesce: Target to enter on host boot failure (allow host graceful shutdown) # - shutdown: Tell host to shutdown, then stop system # - reset: Services to check if host is running and update host "start" target # - crash: Target to run when host crashes. it is very much similar to @@ -150,7 +151,7 @@ HOST_SYNCH_TARGETS = "start-pre starting started stop-pre stopping stopped reset # notifying the host. # - diagnostic-mode: This will be entered when the host is collecting diagnostic # data for itself. -HOST_ACTION_TARGETS = "start startmin stop quiesce reset shutdown crash timeout " +HOST_ACTION_TARGETS = "start startmin stop quiesce graceful-quiesce reset shutdown crash timeout " HOST_ACTION_TARGETS += "reboot warm-reboot force-warm-reboot diagnostic-mode" CHASSIS_SYNCH_FMT = "obmc-power-{0}@.target" @@ -193,6 +194,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERRO SRC_URI += "git://github.com/openbmc/phosphor-state-manager;branch=master;protocol=https" -SRCREV = "106152c64631979b04cdb624ae32755ea1802603" +SRCREV = "aaa8d3466b931b9cf5a64e3a972cd23c2b5b90c6" S = "${WORKDIR}/git" |