From 4b575d6081f799ffcfcd4ccccf0be0911d51990d Mon Sep 17 00:00:00 2001 From: Raptor Engineering Development Team Date: Sat, 12 May 2018 20:37:43 -0500 Subject: Force OCC disable script to have completed execution before host can power on --- .../recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target | 1 + .../common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target | 1 + 2 files changed, 2 insertions(+) diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target index fc4eaa436..6f8e63d5b 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target +++ b/meta-phosphor/common/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/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target index 294ad11db..1713c948c 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target @@ -2,6 +2,7 @@ Description=Start Host%i (Pre) Wants={SYSTEMD_DEFAULT_TARGET} After={SYSTEMD_DEFAULT_TARGET} +After=op-occ-disable@0.service Conflicts=obmc-host-stop@%i.target RefuseManualStart=yes RefuseManualStop=yes -- cgit v1.2.1