summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Geissler <andrewg@us.ibm.com>2017-05-24 13:36:08 -0500
committerAndrew Geissler <andrewg@us.ibm.com>2017-05-24 13:38:59 -0500
commit134eb58782003a8d55f72587fcbc29a2593767d7 (patch)
treea633fbd0bf92eaf988fdf94f67e72b4bbaf49bee
parentc99ad19b76f233f2c31a02d133770377572fc92a (diff)
downloadphosphor-state-manager-134eb58782003a8d55f72587fcbc29a2593767d7.tar.gz
phosphor-state-manager-134eb58782003a8d55f72587fcbc29a2593767d7.zip
Revert "Use shutdown target to stop the host"
This reverts commit c99ad19b76f233f2c31a02d133770377572fc92a. Unfortunately this was not ready for prime time yet. The host ipmid server calls the host state code to power down, which ends up calling the host-ipmid code for a power down. Resolves openbmc/openbmc#1657 Change-Id: I699dba427c5104c7278d04a61224441edf3df216 Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
-rw-r--r--host_state_manager.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/host_state_manager.cpp b/host_state_manager.cpp
index 57ea219..6731432 100644
--- a/host_state_manager.cpp
+++ b/host_state_manager.cpp
@@ -18,10 +18,6 @@ namespace server = sdbusplus::xyz::openbmc_project::State::server;
using namespace phosphor::logging;
-// host-shutdown notifies host of shutdown and that path calls host-stop
-// so initiate a host shutdown with the -shutdown target and consider the
-// host shut down when the -stop target is complete
-constexpr auto HOST_STATE_SOFT_POWEROFF_TGT = "obmc-host-shutdown@0.target";
constexpr auto HOST_STATE_POWEROFF_TGT = "obmc-host-stop@0.target";
constexpr auto HOST_STATE_POWERON_TGT = "obmc-host-start@0.target";
constexpr auto HOST_STATE_QUIESCE_TGT = "obmc-host-quiesce@0.target";
@@ -32,7 +28,7 @@ constexpr auto ACTIVATING_STATE = "activating";
/* Map a transition to it's systemd target */
const std::map<server::Host::Transition,std::string> SYSTEMD_TARGET_TABLE =
{
- {server::Host::Transition::Off, HOST_STATE_SOFT_POWEROFF_TGT},
+ {server::Host::Transition::Off, HOST_STATE_POWEROFF_TGT},
{server::Host::Transition::On, HOST_STATE_POWERON_TGT}
};
OpenPOWER on IntegriCloud