summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaptor Engineering Development Team <support@raptorengineering.com>2018-05-13 01:05:37 -0500
committerRaptor Engineering Development Team <support@raptorengineering.com>2018-05-13 01:26:48 -0500
commit9c3ef2237388f5c5cf52c859e5e0efcc4656da74 (patch)
treefab7c8ef7ee50515012cc3f233af1ade9ed6218c
parentffcd544e567b522a7e1b3c71bd80a22ee10f1581 (diff)
downloadtalos-openbmc-9c3ef2237388f5c5cf52c859e5e0efcc4656da74.tar.gz
talos-openbmc-9c3ef2237388f5c5cf52c859e5e0efcc4656da74.zip
Prevent FSI scan during initial chassis power on and host start
-rw-r--r--meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target1
-rw-r--r--meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target1
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 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
OpenPOWER on IntegriCloud