diff options
| author | Andrew Geissler <andrewg@us.ibm.com> | 2017-05-16 01:04:46 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-05-19 20:34:53 +0300 |
| commit | 67db80d6a387c2677a55ab091abd6e26b715a4cf (patch) | |
| tree | 58b9ee5994509ad294e525ea6d92c831ff653ca7 /meta-phosphor/common | |
| parent | 3f41678b73f37d1cbfffa0ff813b7e0ed074404d (diff) | |
| download | openbmc-67db80d6a387c2677a55ab091abd6e26b715a4cf.tar.xz | |
Conflict with host-stop target vs. host-shutdown
The obmc-host-stop@.target will always be called on host shutdowns
but the inverse is not always true. This commit ensures everything
conflicts with the target that is always called in this path.
Change-Id: Ic680ef96b1d6e2aec844a9c619928b7014fe7450
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common')
4 files changed, 3 insertions, 4 deletions
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target index 21dfa6e49e..94bb2b130d 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target @@ -1,5 +1,5 @@ [Unit] Description=Host%i running after reset -Conflicts=obmc-host-shutdown@%i.target +Conflicts=obmc-host-stop@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target index d823d794f2..6ff68090c6 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target @@ -1,6 +1,6 @@ [Unit] Description=Host%i (Reset Check) -Conflicts=obmc-host-shutdown%i.target +Conflicts=obmc-host-stop%i.target RefuseManualStop=yes [Install] diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target index f1f7be14e3..eb0a9383be 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target @@ -3,6 +3,5 @@ Description=Host%i (Started) Wants={SYSTEMD_DEFAULT_TARGET} After=obmc-host-starting@%i.target Conflicts=obmc-host-stop@%i.target -Conflicts=obmc-host-shutdown@%i.target RefuseManualStart=yes RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service index ba4f0c0987..f480cc5b74 100644 --- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service +++ b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service @@ -6,7 +6,7 @@ Wants=obmc-host-reset-running@%i.target Before=obmc-host-reset-running@%i.target Wants=op-reset-chassis-on@%i.service After=op-reset-chassis-on@%i.service -Conflicts=obmc-host-shutdown@%i.target +Conflicts=obmc-host-stop@%i.target ConditionPathExists=/run/openbmc/chassis@%i-on [Service] |