summaryrefslogtreecommitdiffstats
path: root/meta-phosphor
diff options
context:
space:
mode:
authorRaptor Engineering Development Team <support@raptorengineering.com>2018-05-12 20:37:43 -0500
committerTimothy Pearson <tpearson@raptorengineering.com>2019-04-25 08:02:01 +0000
commitce215967fc73fd443119e373b62b9dc8b4691003 (patch)
tree57a97ad60cbb500d20b2f9f076a9b6149e1fb95f /meta-phosphor
parent8f0d3ac906c2939247bd792ae85bed7c99cfe434 (diff)
downloadtalos-openbmc-ce215967fc73fd443119e373b62b9dc8b4691003.tar.gz
talos-openbmc-ce215967fc73fd443119e373b62b9dc8b4691003.zip
Force OCC disable script to have completed execution before host can power on
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target1
-rw-r--r--meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
index f0664d3cf..d8737fd67 100644
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
@@ -6,6 +6,7 @@ Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
After=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
+After=op-occ-disable@0.service
Conflicts=obmc-chassis-poweroff@%i.target
RefuseManualStop=yes
OnFailure=obmc-chassis-poweroff@%i.target
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
index 3d2600f49..6bedf39c2 100644
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
@@ -2,6 +2,7 @@
Description=Start Host%i (Pre)
Wants=multi-user.target
After=multi-user.target
+After=op-occ-disable@0.service
Conflicts=obmc-host-stop@%i.target
RefuseManualStart=yes
RefuseManualStop=yes
OpenPOWER on IntegriCloud