diff options
| author | Andrew Geissler <andrewg@us.ibm.com> | 2017-05-27 01:40:03 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-06-03 15:57:36 +0300 |
| commit | 5208dbd3b5dfbdfd29f567475ab81c524c1f999e (patch) | |
| tree | 133d52ce889c34a8d12188007ce52df8131f57c4 /meta-phosphor/common/recipes-core | |
| parent | 4faabf42fbc0be6214d81e80ab321c837bdd7984 (diff) | |
| download | openbmc-5208dbd3b5dfbdfd29f567475ab81c524c1f999e.tar.xz | |
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>
Diffstat (limited to 'meta-phosphor/common/recipes-core')
5 files changed, 9 insertions, 1 deletions
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target index 208892fb6..75afd4339 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target @@ -2,6 +2,7 @@ Description=Stop Host%i (Pre) Wants={SYSTEMD_DEFAULT_TARGET} After={SYSTEMD_DEFAULT_TARGET} +Before=obmc-host-stopping@%i.target Conflicts=obmc-host-start@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target index 1043578a6..d3efca58f 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target @@ -1,7 +1,9 @@ [Unit] Description=Host%i (Stopped) Wants={SYSTEMD_DEFAULT_TARGET} -After=obmc-host-stop@%i.target +Wants=obmc-host-stopping@%i.target +After=obmc-host-stopping@%i.target +Before=obmc-power-stop-pre@%i.target Conflicts=obmc-host-start@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target index bc81a577f..6209c52b1 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target @@ -1,7 +1,9 @@ [Unit] Description=Host%i (Stopping) Wants={SYSTEMD_DEFAULT_TARGET} +Wants=obmc-host-stop-pre@%i.target After=obmc-host-stop-pre@%i.target +Before=obmc-host-stopped@%i.target Conflicts=obmc-host-start@%i.target Conflicts=obmc-host-starting@%i.target RefuseManualStart=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target index 2f130c9dc..50d5050bb 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target @@ -2,6 +2,8 @@ Description=Power%i Off (Pre) Wants={SYSTEMD_DEFAULT_TARGET} After={SYSTEMD_DEFAULT_TARGET} +Wants=obmc-host-stopped@%i.target +After=obmc-host-stopped@%i.target Conflicts=obmc-chassis-poweron@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target index b32d76f9b..f0429d786 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target @@ -1,5 +1,6 @@ [Unit] Description=Power%i Off +Wants=obmc-power-stop-pre@%i.target After=obmc-power-stop-pre@%i.target Wants={SYSTEMD_DEFAULT_TARGET} Conflicts=obmc-chassis-poweron@%i.target |