From b8c47703036a3ebcfda7491da42cff5c2c11b084 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 2 Mar 2017 16:25:43 -0600 Subject: 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 --- .../recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service | 1 + .../recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service | 1 + .../recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service | 1 + .../recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service | 1 + .../recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service | 1 + .../recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service | 1 + .../recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service | 1 + .../recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service | 1 + .../recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service | 1 + .../recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service | 1 + .../recipes-phosphor/chassis/vrm-control/vrm-control@.service | 1 + .../recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service | 1 + .../recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service | 1 + 13 files changed, 13 insertions(+) (limited to 'meta-openbmc-machines/meta-openpower') diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service index e759d5d64..c9cd09aa8 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service @@ -7,6 +7,7 @@ After=obmc-power-on@%i.target Wants=fsi-scan@%i.service After=fsi-scan@%i.service Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/vcs_workaround.sh {MACHINE} diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index 55957f39f..4d300c5a1 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service @@ -4,6 +4,7 @@ Wants=avsbus-workaround@%i.service After=avsbus-workaround@%i.service Before=vrm-control@%i.service Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/avsbus-disable.sh diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index 850da2101..34e68fe32 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -3,6 +3,7 @@ Description=Enable the AVS bus on VRMs Wants=vrm-control@%i.service After=vrm-control@%i.service Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/avsbus-enable.sh diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service index ea18e16b0..1bae8df0b 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service @@ -4,6 +4,7 @@ Wants=op-power-start@.service After=op-power-start@.service Before=avsbus-disable@%i.service Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/avsbus-workaround.sh diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index 55957f39f..4d300c5a1 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service @@ -4,6 +4,7 @@ Wants=avsbus-workaround@%i.service After=avsbus-workaround@%i.service Before=vrm-control@%i.service Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/avsbus-disable.sh diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index e7d3fe157..35475673f 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -4,6 +4,7 @@ Wants=vrm-control@%i.service After=vrm-control@%i.service Before=vcs_off@%i.service Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/avsbus-enable.sh diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service index ac1c6c0de..b3eb1b8fc 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service @@ -4,6 +4,7 @@ Wants=ucd_disable_vcs@%i.service After=ucd_disable_vcs@%i.service Before=avsbus-disable@%i.service Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/avsbus-workaround.sh diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service index cf2fdce57..16088941a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service @@ -3,6 +3,7 @@ Description=Disable UCD VCS rails Wants=obmc-power-start-pre@%i.target Before=obmc-power-start-pre@%i.target Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/ucd_disable_vcs.sh diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service index f929afbe5..81cc68187 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service @@ -3,6 +3,7 @@ Description=Disable VCS before Witherspoon power on Wants=obmc-power-start-pre@%i.target Before=obmc-power-start-pre@%i.target Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/vcs_off.sh diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service index df74920e1..181026c2b 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service @@ -5,6 +5,7 @@ After=vcs_workaround@%i.service 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={bindir}/vcs_on.sh diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service index 607423a34..12c189f54 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service @@ -4,6 +4,7 @@ Wants=avsbus-disable@%i.service After=avsbus-disable@%i.service Before=avsbus-enable@%i.service Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/vrm-control.sh vdna=0.9 vdnb=0.9 diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index f9fd42567..8561bf2db 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service @@ -3,6 +3,7 @@ Description=Disable AVSBus on VRMs Wants=obmc-power-stop-pre@%i.target Before=obmc-power-stop-pre@%i.target Conflicts=obmc-chassis-start@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/zaius_avsbus.sh disable diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index 5980d7ceb..f305907ec 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -3,6 +3,7 @@ Description=Enable AVSBus on VRMs Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target Conflicts=obmc-chassis-stop@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] ExecStart={bindir}/zaius_avsbus.sh vdn_max -- cgit v1.2.1