diff options
author | Andrew Geissler <andrewg@us.ibm.com> | 2017-01-30 12:42:40 -0600 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-02-01 19:45:17 +0000 |
commit | c770d9e783afddab021a4896732c4e19341d512b (patch) | |
tree | 5c431bbe56c4e4ad601c3e0c7b50628020a0a25e /meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor | |
parent | bd06071884fa3568b9de7561ab471d255bc6fdb7 (diff) | |
download | talos-openbmc-c770d9e783afddab021a4896732c4e19341d512b.tar.gz talos-openbmc-c770d9e783afddab021a4896732c4e19341d512b.zip |
Move VCS workarounds into new obmc-power-chassis targets
Change-Id: I12e71adf8d2635360087a0781354391121af3d7b
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor')
5 files changed, 11 insertions, 11 deletions
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 2fdd52e6f..1cebcc729 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 @@ -31,12 +31,12 @@ INSTFMT_OFF = "vcs_off@{0}.service" INSTFMT_OFF_PO = "vcs_off_poweroff@{0}.service" INSTFMT_ON = "vcs_on@{0}.service" INSTFMT_UCD = "ucd_disable_vcs@{0}.service" -TGTFMT = "obmc-chassis-start@{0}.target" -TGTFMT_STOP= "obmc-chassis-stop@{0}.target" +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_STOP}.wants/${INSTFMT_OFF_PO}" +FMT_OFF_PO = "../${TMPL_OFF_PO}:${TGTFMT_OFF}.wants/${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/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 c218d05c5..cf2fdce57 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 @@ -2,7 +2,7 @@ Description=Disable UCD VCS rails Wants=obmc-power-start-pre@%i.target Before=obmc-power-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-power-chassis-off@%i.target [Service] ExecStart={bindir}/ucd_disable_vcs.sh @@ -10,4 +10,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-power-chassis-on@%i.target 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 99b450832..f929afbe5 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 @@ -2,7 +2,7 @@ Description=Disable VCS before Witherspoon power on Wants=obmc-power-start-pre@%i.target Before=obmc-power-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-power-chassis-off@%i.target [Service] ExecStart={bindir}/vcs_off.sh @@ -10,4 +10,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-power-chassis-on@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service index d8d4b2c8e..e039479f9 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service @@ -2,7 +2,7 @@ Description=Disable VCS on a power off Wants=op-wait-power-off@%i.service After=op-wait-power-off@%i.service -Conflicts=obmc-chassis-start@%i.target +Conflicts=obmc-power-chassis-on@%i.target [Service] ExecStart={bindir}/vcs_off.sh @@ -10,4 +10,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy=obmc-chassis-stop@%i.target +WantedBy=obmc-power-chassis-off@%i.target 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 c86bd432c..df74920e1 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 @@ -4,7 +4,7 @@ Wants=vcs_workaround@%i.service After=vcs_workaround@%i.service Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-power-chassis-off@%i.target [Service] ExecStart={bindir}/vcs_on.sh @@ -12,4 +12,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-power-chassis-on@%i.target |