fsi-scan: ensure run on all boots

This service needs to be run in both the obmc-chassis-poweron target and
obmc-host-startmin target. This is so support is there for FSI
operations with just a "obmcutil chassison" as well as supporting the
warm reboot path where a chassison is not executed. The service will
only run once during a normal boot due to the way the service is
configured.

Similar to the CFAM reset, the FSI scan service should also not be run
on memory preserving reboots.

(From meta-openpower rev: b81b81a2dc37288396bdea38caff429d876f5740)

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I9447a374afa405197ca5ae9373f758c653ca8dc0
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
index dd837ef..c37863e 100644
--- a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
+++ b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
@@ -4,7 +4,10 @@
 After=obmc-power-on@%i.target
 Wants=obmc-host-start-pre@%i.target
 Before=obmc-host-start-pre@%i.target
+After=op-cfam-reset.service
 Conflicts=obmc-chassis-poweroff@%i.target
+Conflicts=obmc-host-stop@%i.target
+ConditionPathExists=!/run/openbmc/mpreboot@%i
 
 [Service]
 ExecStart=/usr/bin/env openpower-proc-control scanFSI
@@ -15,3 +18,4 @@
 
 [Install]
 WantedBy=obmc-chassis-poweron@%i.target
+WantedBy=obmc-host-startmin@%i.target