diff options
| author | Raptor Engineering Development Team <support@raptorengineering.com> | 2018-05-12 20:37:43 -0500 |
|---|---|---|
| committer | Raptor Engineering Development Team <support@raptorengineering.com> | 2018-05-12 20:37:43 -0500 |
| commit | 4b575d6081f799ffcfcd4ccccf0be0911d51990d (patch) | |
| tree | 56e38feac79bc24ad09591d21606a0e5e36f82b0 | |
| parent | 26839f66a5934a47114e1eaf8b079bd0c45346c3 (diff) | |
| download | talos-openbmc-4b575d6081f799ffcfcd4ccccf0be0911d51990d.tar.gz talos-openbmc-4b575d6081f799ffcfcd4ccccf0be0911d51990d.zip | |
Force OCC disable script to have completed execution before host can power on
| -rw-r--r-- | meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target | 1 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target | 1 |
2 files changed, 2 insertions, 0 deletions
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 |
