diff options
| author | Andrew Geissler <andrewg@us.ibm.com> | 2017-05-09 15:24:41 -0500 |
|---|---|---|
| committer | Andrew Geissler <andrewg@us.ibm.com> | 2017-05-09 21:38:50 -0500 |
| commit | dd08ef0553067a8624d4a51ca2bd4548e47f44d9 (patch) | |
| tree | f14909b2f1d5395ee635c01fadc5bd3b8f2a506e /meta-phosphor/common/recipes-phosphor/chassis | |
| parent | b1afecc2797d06e1e54094b72c5f2586be73bbdd (diff) | |
| download | talos-openbmc-dd08ef0553067a8624d4a51ca2bd4548e47f44d9.tar.gz talos-openbmc-dd08ef0553067a8624d4a51ca2bd4548e47f44d9.zip | |
Update chassis reset targets to refactored name
During the target name refactor, we missed the chassis reset targets
Resolves openbmc/openbmc#1274
Change-Id: Ic6a799314931f0c6b7db0e0b95ac6eec50bfcaac
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/chassis')
4 files changed, 6 insertions, 6 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb index 2672335d4..19efac655 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb @@ -43,7 +43,7 @@ OFF_INSTFMT = "op-wait-power-off@{0}.service" OFF_FMT = "../${OFF_TMPL}:${STOP_TGTFMT}.requires/${OFF_INSTFMT}" RESET_TMPL = "op-reset-pgood-check@.service" -RESET_TGTFMT = "obmc-chassis-reset@{1}.target" +RESET_TGTFMT = "obmc-chassis-powerreset@{1}.target" RESET_INSTFMT = "op-reset-pgood-check@{0}.service" RESET_FMT = "../${RESET_TMPL}:${RESET_TGTFMT}.requires/${RESET_INSTFMT}" @@ -78,8 +78,8 @@ STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFM SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" # Force the standby target to run the chassis reset check target -RESET_TMPL_CTRL = "obmc-chassis-reset@.target" +RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -RESET_INSTFMT_CTRL = "obmc-chassis-reset@{0}.target" +RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target" RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service index cb78804e0..7c55e1110 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service @@ -11,4 +11,4 @@ ExecStart=/bin/systemctl start obmc-chassis-poweron@%i.target [Install] -WantedBy=obmc-chassis-reset@%i.target +WantedBy=obmc-chassis-powerreset@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service index 2a461513d..ea975ea21 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service @@ -13,4 +13,4 @@ ExecStart=/bin/sh -c "busctl get-property `mapper get-service /org/openbmc/contr [Install] -WantedBy=obmc-chassis-reset@%i.target +WantedBy=obmc-chassis-powerreset@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service index da852ff3f..cfc1eed96 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service @@ -13,4 +13,4 @@ ExecStart=/bin/sh -c "mkdir -p /run/openbmc/ && touch /run/openbmc/chassis@%i-on [Install] -WantedBy=obmc-chassis-reset@%i.target +WantedBy=obmc-chassis-powerreset@%i.target |
