From 9c3ef2237388f5c5cf52c859e5e0efcc4656da74 Mon Sep 17 00:00:00 2001 From: Raptor Engineering Development Team Date: Sun, 13 May 2018 01:05:37 -0500 Subject: Prevent FSI scan during initial chassis power on and host start --- .../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 6f8e63d5b..b98ca4483 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 @@ -8,6 +8,7 @@ Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_proj 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 +Conflicts=fsi-scan@i.service RefuseManualStop=yes OnFailure=obmc-chassis-poweroff@%i.target OnFailureJobMode=flush 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 1713c948c..1b110963b 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 @@ -4,6 +4,7 @@ Wants={SYSTEMD_DEFAULT_TARGET} After={SYSTEMD_DEFAULT_TARGET} After=op-occ-disable@0.service Conflicts=obmc-host-stop@%i.target +Conflicts=fsi-scan@i.service RefuseManualStart=yes RefuseManualStop=yes ConditionPathExists=!/run/openbmc/host@0-ipl-complete -- cgit v1.2.1