Move mboxd reset to power on path

To ensure the BMC does not interfere with host checkstop
analysis, the mboxd reset should be run during power
on

Resolves openbmc/openbmc#1915

Change-Id: I42812c5dc73ead585adb7e1455ff3a46f9a52404
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb
index acb6c8e..91881b1 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb
+++ b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb
@@ -38,7 +38,7 @@
 }
 
 TMPL = "mboxd-reload@.service"
-TGTFMT = "obmc-chassis-poweroff@{0}.target"
+TGTFMT = "obmc-chassis-poweron@{0}.target"
 INSTFMT = "mboxd-reload@{0}.service"
 FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}"
 
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
index 1b89de9..6206bb3 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
+++ b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
@@ -1,8 +1,8 @@
 [Unit]
-Description=Reload mboxd after power off
-Wants=op-wait-power-off@%i.service
-After=op-wait-power-off@%i.service
-Conflicts=obmc-chassis-poweron@%i.target
+Description=Reload mboxd during power on
+Wants=obmc-power-start-pre@%i.target
+Before=obmc-power-start-pre@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]
 Type=oneshot
@@ -10,4 +10,4 @@
 ExecStart={sbindir}/mboxctl --reset
 
 [Install]
-WantedBy=obmc-chassis-poweroff@%i.target
+WantedBy=obmc-chassis-poweron@%i.target