diff options
| author | Andrew Geissler <andrewg@us.ibm.com> | 2017-05-15 17:04:46 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-05-19 17:34:53 +0000 |
| commit | 67db80d6a387c2677a55ab091abd6e26b715a4cf (patch) | |
| tree | 58b9ee5994509ad294e525ea6d92c831ff653ca7 /meta-phosphor/common/recipes-phosphor/state | |
| parent | 3f41678b73f37d1cbfffa0ff813b7e0ed074404d (diff) | |
| download | talos-openbmc-67db80d6a387c2677a55ab091abd6e26b715a4cf.tar.gz talos-openbmc-67db80d6a387c2677a55ab091abd6e26b715a4cf.zip | |
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/recipes-phosphor/state')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service | 2 |
1 files changed, 1 insertions, 1 deletions
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 ba4f0c098..f480cc5b7 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] |
