Zaius: Rearrange vcs-on/refclock-fixup/avsbus-en
Move vcs-on@.service, op-refclock@.service, and
avsbus-enable@0.service to run as part of
obmc-power-chassis-on.target instead of obmc-chassis-start.target
so that after starting just obmc-chassis-start@0.target cronus
will be able to run.
Resolves openbmc/openbmc#1396
Change-Id: Ic00614abc3ea27167041614e63eed392b5b622f9
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
index 0162ede..39aa5a3 100644
--- a/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
@@ -10,9 +10,9 @@
INSTFMT_OFF = "avsbus-disable@{0}.service"
INSTFMT_ON = "avsbus-enable@{0}.service"
TGTFMT_OFF = "obmc-chassis-stop@{0}.target"
-TGTFMT_ON = "obmc-chassis-start@{0}.target"
+TGTFMT_ON = "obmc-power-chassis-on@{0}.target"
FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}"
-FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.wants/${INSTFMT_ON}"
+FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}"
SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}"
SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
index f305907..23c9f32 100644
--- a/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ b/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -12,4 +12,4 @@
RemainAfterExit=yes
[Install]
-WantedBy=obmc-chassis-start@%i.target
+RequiredBy=obmc-power-chassis-on@%i.target
diff --git a/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb b/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb
index ac2c585..2b2bb71 100644
--- a/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb
+++ b/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb
@@ -6,8 +6,8 @@
TMPL = "op-refclock-fixup@.service"
INSTFMT = "op-refclock-fixup@{0}.service"
-TGTFMT = "obmc-chassis-start@{0}.target"
-FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}"
+TGTFMT = "obmc-power-chassis-on@{0}.target"
+FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
SYSTEMD_SERVICE_${PN} += "${TMPL}"
SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service b/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
index c579f77..c94772d 100644
--- a/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
+++ b/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
@@ -14,4 +14,4 @@
ExecStart={sbindir}/fix_zaius_refclock.sh
[Install]
-WantedBy=obmc-chassis-start@%i.target
+RequiredBy=obmc-power-chassis-on@%i.target
diff --git a/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
index aa14203..c7710b3 100644
--- a/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
+++ b/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
@@ -13,9 +13,9 @@
INSTFMT_OFF = "vcs-off@{0}.service"
INSTFMT_ON = "vcs-on@{0}.service"
TGTFMT_OFF = "obmc-chassis-stop@{0}.target"
-TGTFMT_ON = "obmc-chassis-start@{0}.target"
+TGTFMT_ON = "obmc-power-chassis-on@{0}.target"
FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}"
-FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.wants/${INSTFMT_ON}"
+FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}"
SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}"
SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service b/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
index 5b93fea..354e565 100644
--- a/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
+++ b/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
@@ -12,4 +12,4 @@
RemainAfterExit=yes
[Install]
-WantedBy=obmc-chassis-start@%i.target
+RequiredBy=obmc-power-chassis-on@%i.target