summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power
diff options
context:
space:
mode:
authorAndrew Geissler <andrewg@us.ibm.com>2017-01-26 08:07:15 -0600
committerPatrick Williams <patrick@stwcx.xyz>2017-02-01 19:45:09 +0000
commit2478d3773170bcabcd342a3daf6d4184ad8cd238 (patch)
tree4d59e39755498d309f1398a269a6dc8b52c52636 /meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power
parentd8819ed2b4e26342691b48709811035dfa1eaba2 (diff)
downloadtalos-openbmc-2478d3773170bcabcd342a3daf6d4184ad8cd238.tar.gz
talos-openbmc-2478d3773170bcabcd342a3daf6d4184ad8cd238.zip
Make chassis start/stop depend on chassis power on/off
Change-Id: I5e4a0da68bfcebb12f3ac4161e63c145f9f73b0a Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power')
-rw-r--r--meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service2
-rw-r--r--meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service2
-rw-r--r--meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service2
-rw-r--r--meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
index cae414f8a..e98d08f7e 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
@@ -6,7 +6,7 @@ After=obmc-power-start-pre@%i.target
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/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
index f370a3cd9..9120a87bd 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
@@ -5,7 +5,7 @@ Before=obmc-power-stop@%i.target
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/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
index 431514095..8c4d3d3b5 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
@@ -5,7 +5,7 @@ Wants=obmc-power-stop@%i.target
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/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
index 16b83c0cb..d5eb9dc06 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
@@ -5,7 +5,7 @@ Wants=obmc-power-start@%i.target
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
OpenPOWER on IntegriCloud