Move AVS workarounds into new obmc-power-chassis targets
Change-Id: I49c9ce703673e18ef17684f0b3e02626ddb091af
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
index 4430429..daca634 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
@@ -27,7 +27,7 @@
INSTFMT_EN= "avsbus-enable@{0}.service"
INSTFMT_DIS= "avsbus-disable@{0}.service"
INSTFMT_WA= "avsbus-workaround@{0}.service"
-TGTFMT = "obmc-chassis-start@{0}.target"
+TGTFMT = "obmc-power-chassis-on@{0}.target"
FMT_EN = "../${TMPL_EN}:${TGTFMT}.wants/${INSTFMT_EN}"
FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.wants/${INSTFMT_DIS}"
FMT_WA = "../${TMPL_WA}:${TGTFMT}.wants/${INSTFMT_WA}"
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
index 1970f00..55957f3 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
@@ -3,7 +3,7 @@
Wants=avsbus-workaround@%i.service
After=avsbus-workaround@%i.service
Before=vrm-control@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
[Service]
ExecStart={bindir}/avsbus-disable.sh
@@ -11,4 +11,4 @@
RemainAfterExit=yes
[Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
index 9032f68..e7d3fe1 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -3,7 +3,7 @@
Wants=vrm-control@%i.service
After=vrm-control@%i.service
Before=vcs_off@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
[Service]
ExecStart={bindir}/avsbus-enable.sh
@@ -11,4 +11,4 @@
RemainAfterExit=yes
[Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
index 5662371..ac1c6c0 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
@@ -3,7 +3,7 @@
Wants=ucd_disable_vcs@%i.service
After=ucd_disable_vcs@%i.service
Before=avsbus-disable@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
[Service]
ExecStart={bindir}/avsbus-workaround.sh
@@ -11,4 +11,4 @@
RemainAfterExit=yes
[Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target