| commit | 82d4e1187e1a828d5db36d573e3640db79c7cc6c | [log] [tgz] |
|---|---|---|
| author | Andrew Geissler <andrewg@us.ibm.com> | Tue May 30 11:29:32 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Sat Jun 03 12:57:42 2017 +0000 |
| tree | 93b5a9b801304cf44a8eb67d5748a1849737aef2 | |
| parent | 191400b02960d1efa468f80724f6700d543a36ff [diff] |
Only run soft power off when not host requested When a power off or reboot is host initiated, do not run the soft power off service. Since the host is the one requesting the action, there's no need to execute the soft off function (notification to host to shutdown). Change-Id: Ia6e833598e6042646e5d5bd17821ed29e141fa6f Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service index de2ff70..9696b1a 100644 --- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service +++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
@@ -15,6 +15,7 @@ ExecStart={sbindir}/pgood_wait /org/openbmc/control/power%i off ExecStart=/bin/rm -f /run/openbmc/chassis@%i-on ExecStart=/bin/rm -f /run/openbmc/host@%i-on +ExecStart=/bin/rm -f /run/openbmc/host@%i-request [Install] WantedBy=obmc-host-stop@%i.target
diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service index d1a814f..2f61b07 100644 --- a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service +++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
@@ -4,6 +4,7 @@ After=mapper-wait@-org-openbmc-HostIpmi-1.service Wants=obmc-host-stopping@0.target Before=obmc-host-stopping@0.target +ConditionPathExists=!/run/openbmc/host@0-request [Service] Restart=no