| commit | c4bb5fa8ef4a03028f4475ff25bd4472deddb79e | [log] [tgz] |
|---|---|---|
| author | Andrew Geissler <andrewg@us.ibm.com> | Thu Mar 02 16:25:43 2017 -0600 |
| committer | Andrew Geissler <geissonator@yahoo.com> | Wed Mar 15 19:55:20 2017 +0000 |
| tree | 26e0292a58350516daf691320482ec4b29700947 | |
| parent | 3fcadf8a39c8a3c44f408c5fff1b028ff6f1da56 [diff] |
Do not run chassis power target services if power on This is the first commit in a series that will ensure we do not run the chassis power on services when the chassis is already on. Specifically this is to handle the situation where the chassis is on and the BMC is rebooted. Change-Id: I733ca076f044731a4ba327fe2f46302dce5f4edd Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/common/recipes-phosphor/chassis/obmc-fsi-scan/fsi-scan@.service b/common/recipes-phosphor/chassis/obmc-fsi-scan/fsi-scan@.service index 8f94e28..ca19f1d 100644 --- a/common/recipes-phosphor/chassis/obmc-fsi-scan/fsi-scan@.service +++ b/common/recipes-phosphor/chassis/obmc-fsi-scan/fsi-scan@.service
@@ -5,6 +5,7 @@ Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan"
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service index d6c1ae4..0813123 100644 --- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service +++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
@@ -7,6 +7,7 @@ Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] RemainAfterExit=yes
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service index d5eb9dc..5245846 100644 --- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service +++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
@@ -6,6 +6,7 @@ Wants=mapper-wait@-org-openbmc-control-power%i.service After=mapper-wait@-org-openbmc-control-power%i.service Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] Type=oneshot