| commit | fb7fa82fa9d7a071d7f6f98bf38dfc032a50e88f | [log] [tgz] |
|---|---|---|
| author | Andrew Geissler <andrewg@us.ibm.com> | Thu Jan 26 08:07:15 2017 -0600 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Wed Feb 01 19:45:09 2017 +0000 |
| tree | 0358cb13e5c6738d3e32b69b377076c2a0ef5871 | |
| parent | 44761d2829f8d1a938a309f93e3be1bcb7eec188 [diff] |
Make chassis start/stop depend on chassis power on/off Change-Id: I5e4a0da68bfcebb12f3ac4161e63c145f9f73b0a Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service index cae414f..e98d08f 100644 --- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service +++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
@@ -6,7 +6,7 @@ After=obmc-fan-control.target Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-power-chassis-off@%i.target [Service] RemainAfterExit=yes
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 f370a3c..9120a87 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
@@ -5,7 +5,7 @@ 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-start@%i.target +Conflicts=obmc-power-chassis-on@%i.target [Service] RemainAfterExit=yes
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 4315140..8c4d3d3 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
@@ -5,7 +5,7 @@ Before=obmc-power-stop@%i.target Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-chassis-start@%i.target +Conflicts=obmc-power-chassis-on@%i.target [Service] Type=oneshot
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service index 16b83c0..d5eb9dc 100644 --- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service +++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
@@ -5,7 +5,7 @@ Before=obmc-power-start@%i.target Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-power-chassis-off@%i.target [Service] Type=oneshot