commit c41163a84393590a8443343f26566414ee2fad4b
author Josh D. King <jdking@us.ibm.com> Thu May 18 09:33:36 2017 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed May 24 12:23:12 2017 +0000
tree 8bba38cbfad9d9a53f74cdf1f946e778be7bb886
parent 09008c9faacb8d0ea32ffa5636c9f8dd1c2946b8

Combined services to create chassis-running service

Took the contents of op-reset-pgood-check and
op-reset-set-power-on and combined them to create
the new service op-reset-chassis-running.

Resolves openbmc/openbmc#1337

Change-Id: I6cdb93fcf9f7e701703482ef3dcb8b23ef75cf93
Signed-off-by: Josh D. King <jdking@us.ibm.com>
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>

common/recipes-phosphor/chassis/obmc-op-control-power.bb

diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
index 19efac6..f85859c 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power.bb
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
@@ -17,8 +17,7 @@
         op-wait-power-on@.service \
         op-power-stop@.service \
         op-wait-power-off@.service \
-        op-reset-pgood-check@.service \
-        op-reset-set-power-on@.service \
+        op-reset-chassis-running@.service \
         op-reset-chassis-on@.service \
         "
 
@@ -42,13 +41,10 @@
 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-powerreset@{1}.target"
-RESET_INSTFMT = "op-reset-pgood-check@{0}.service"
-RESET_FMT = "../${RESET_TMPL}:${RESET_TGTFMT}.requires/${RESET_INSTFMT}"
 
-RESET_ON_TMPL = "op-reset-set-power-on@.service"
-RESET_ON_INSTFMT = "op-reset-set-power-on@{0}.service"
+RESET_ON_TMPL = "op-reset-chassis-running@.service"
+RESET_ON_INSTFMT = "op-reset-chassis-running@{0}.service"
 RESET_ON_FMT = "../${RESET_ON_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_INSTFMT}"
 
 RESET_ON_CHASSIS_TMPL = "op-reset-chassis-on@.service"
@@ -60,7 +56,6 @@
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"