| commit | 59b78bf1d7fa0cfc4e451e6a3041b7aa314ff1fc | [log] [tgz] |
|---|---|---|
| author | Andrew Geissler <andrewg@us.ibm.com> | Mon May 15 17:04:46 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Fri May 19 17:34:53 2017 +0000 |
| tree | 2095b27e23eb54ddc2c606f188d9b8d29a201db7 | |
| parent | 986e98d0fcc62e8e7d7c03cd8dcef564384c4105 [diff] |
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>
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target index 21dfa6e..94bb2b1 100644 --- a/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target +++ b/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/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target index d823d79..6ff6809 100644 --- a/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target +++ b/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/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target index f1f7be1..eb0a938 100644 --- a/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target +++ b/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
@@ -3,6 +3,5 @@ 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/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service b/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service index ba4f0c0..f480cc5 100644 --- a/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service +++ b/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
@@ -6,7 +6,7 @@ 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]