diff options
author | Andrew Geissler <andrewg@us.ibm.com> | 2017-02-08 15:54:25 -0600 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-02-15 21:43:38 +0000 |
commit | 3c35a8c009ae5c2b093b0bbe28c48d82f345e58e (patch) | |
tree | 5f360962c0ad40a93d0c1c07e1f19cde4cc5aa4f /meta-openbmc-machines | |
parent | 977b7a12a09937f692e3218ef5b15cb32716f911 (diff) | |
download | talos-openbmc-3c35a8c009ae5c2b093b0bbe28c48d82f345e58e.tar.gz talos-openbmc-3c35a8c009ae5c2b093b0bbe28c48d82f345e58e.zip |
Change wants to requires for all critical services
In order for targets to fail when their services fail,
the relationship must be a "requires"
Change-Id: I1523dd51af8817b473557bac65e9e71eacecf52e
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
6 files changed, 11 insertions, 11 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb index 3f7bf2bf0..16d24c79a 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb @@ -25,7 +25,7 @@ do_install() { TMPL = "start_host@.service" INSTFMT = "start_host@{0}.service" TGTFMT = "obmc-chassis-start@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb index 12b8357db..b03e26c0c 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb @@ -22,7 +22,7 @@ do_install() { TMPL = "vcs_workaround@.service" INSTFMT = "vcs_workaround@{0}.service" TGTFMT = "obmc-power-chassis-on@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb index daca634f6..25af11261 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb @@ -28,9 +28,9 @@ INSTFMT_EN= "avsbus-enable@{0}.service" INSTFMT_DIS= "avsbus-disable@{0}.service" INSTFMT_WA= "avsbus-workaround@{0}.service" 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}" +FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" +FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" +FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" SYSTEMD_SERVICE_${PN} += "${TMPL_EN}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb index 1cebcc729..ec7eecaf9 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb @@ -33,10 +33,10 @@ INSTFMT_ON = "vcs_on@{0}.service" INSTFMT_UCD = "ucd_disable_vcs@{0}.service" TGTFMT = "obmc-power-chassis-on@{0}.target" TGTFMT_OFF= "obmc-power-chassis-off@{0}.target" -FMT_OFF = "../${TMPL_OFF}:${TGTFMT}.wants/${INSTFMT_OFF}" -FMT_ON = "../${TMPL_ON}:${TGTFMT}.wants/${INSTFMT_ON}" -FMT_UCD = "../${TMPL_UCD}:${TGTFMT}.wants/${INSTFMT_UCD}" -FMT_OFF_PO = "../${TMPL_OFF_PO}:${TGTFMT_OFF}.wants/${INSTFMT_OFF_PO}" +FMT_OFF = "../${TMPL_OFF}:${TGTFMT}.requires/${INSTFMT_OFF}" +FMT_ON = "../${TMPL_ON}:${TGTFMT}.requires/${INSTFMT_ON}" +FMT_UCD = "../${TMPL_UCD}:${TGTFMT}.requires/${INSTFMT_UCD}" +FMT_OFF_PO = "../${TMPL_OFF_PO}:${TGTFMT_OFF}.requires/${INSTFMT_OFF_PO}" SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb index 7d577cc38..ba745bdf4 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb @@ -18,7 +18,7 @@ do_install() { TMPL = "vrm-control@.service" INSTFMT = "vrm-control@{0}.service" TGTFMT = "obmc-power-chassis-on@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb index a758c917a..c98af0b46 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb @@ -14,7 +14,7 @@ SRC_URI += "file://set_fan_speeds.sh" TMPL = "fan-default-speed@.service" INSTFMT = "fan-default-speed@{0}.service" TGTFMT = "obmc-chassis-start@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" |