diff options
| author | Andrew Geissler <andrewg@us.ibm.com> | 2017-05-15 20:00:13 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-05-19 17:34:54 +0000 |
| commit | d75d9c516913bee640e3b4c245e8bd40e0965002 (patch) | |
| tree | 82a8f97613f1a697ca142b8fe4bc4d48f60a9877 /meta-phosphor/common/recipes-phosphor/chassis | |
| parent | 67db80d6a387c2677a55ab091abd6e26b715a4cf (diff) | |
| download | talos-openbmc-d75d9c516913bee640e3b4c245e8bd40e0965002.tar.gz talos-openbmc-d75d9c516913bee640e3b4c245e8bd40e0965002.zip | |
Ensure host-stop target called on chassis-poweroff
If the chassis-poweroff target is called directly by a user,
this change will ensure we properly clean up any host target
services
Resolves openbmc/openbmc#1310
Change-Id: I476db8dde0740f1b63d2e8ca4b6c661c16c9c73c
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/chassis')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb index 19efac655..8935ef0b4 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb @@ -77,6 +77,14 @@ STOP_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +# Ensure when the obmc-chassis-poweroff target is called that +# obmc-host-stop target is also called +OFF_TMPL_CTRL = "obmc-host-stop@.target" +OFF_TGTFMT_CTRL = "obmc-chassis-poweroff@{1}.target" +OFF_INSTFMT_CTRL = "obmc-host-stop@{0}.target" +OFF_FMT_CTRL = "../${OFF_TMPL_CTRL}:${OFF_TGTFMT_CTRL}.requires/${OFF_INSTFMT_CTRL}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT_CTRL', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" + # Force the standby target to run the chassis reset check target RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" |
