| commit | 191400b02960d1efa468f80724f6700d543a36ff | [log] [tgz] |
|---|---|---|
| author | Andrew Geissler <andrewg@us.ibm.com> | Fri May 26 17:40:03 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Sat Jun 03 12:57:36 2017 +0000 |
| tree | 2dc6d667ca9761ed7dd99e10b8ad188ec4b29edd | |
| parent | 1f962b79d6a4836d76b837bfac963833285a8eb1 [diff] |
Ensure host-shutdown target calls the host-stop target As a part of the soft power off (host-shutdown) ensure that the host-stop target always gets called. Updated the involved services to ensure they are run in the correct order. Change-Id: I7e9113631786f0d0cb0f89b94c4b97fdc0328e7b Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service index dd3570e..0833afb 100644 --- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service +++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
@@ -2,6 +2,7 @@ Description=Stop Power%i Wants=obmc-power-stop@%i.target Before=obmc-power-stop@%i.target +Wants=obmc-power-stop-pre@%i.target After=obmc-power-stop-pre@%i.target Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service
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 ad2b8b2..de2ff70 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
@@ -3,6 +3,8 @@ Before=obmc-power-off@%i.target Wants=obmc-power-stop@%i.target Before=obmc-power-stop@%i.target +Wants=obmc-power-stop-pre@%i.target +After=obmc-power-stop-pre@%i.target Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service Conflicts=obmc-chassis-poweron@%i.target
diff --git a/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service b/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service index d149403..63f340b 100644 --- a/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service +++ b/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
@@ -2,6 +2,8 @@ Description=Stop Watchdog%i Wants=mapper-wait@-org-openbmc-watchdog-host%i.service After=mapper-wait@-org-openbmc-watchdog-host%i.service +Wants=obmc-host-stop-pre@%i.target +Before=obmc-host-stop-pre@%i.target Conflicts=obmc-host-start@%i.target [Service]