host-stop: ensure stop-instructions run in correct seq

The flow of synchronization targets during a obmc-host-stop@.target is
the following:
obmc-host-stop-pre -> obmc-host-stopping -> obmc-host-stopped

The obmc-host-stop-pre is where we notify the host that a shutdown is
occurring and allow it to gracefully shut itself down. Once that is
complete we run obmc-host-stopping services (i.e. things the BMC does to
actually stop the host like stop-instructions).

Move the op-stop-instructions@.service to the correct synchronization
targets and remove the soft off service dependency since that will now
be enforced via the correct synchronization targets.

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I9b4c36b44eef2dab38ad1ab26eb10ee7e1b9a6dc
diff --git a/op-stop-instructions@.service.in b/op-stop-instructions@.service.in
index fd45279..160a8bb 100644
--- a/op-stop-instructions@.service.in
+++ b/op-stop-instructions@.service.in
@@ -1,9 +1,10 @@
 [Unit]
 Description=Stop instructions for host%i
 Wants=obmc-host-stop-pre@%i.target
-Before=obmc-host-stop-pre@%i.target
+After=obmc-host-stop-pre@%i.target
+Wants=obmc-host-stopping@%i.target
+Before=obmc-host-stopping@%i.target
 After=op-occ-disable@%i.service
-After=xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
 Conflicts=obmc-host-startmin@%i.target
 ConditionPathExists=/sys/class/fsi-master/fsi0/slave@00:00/cfam_id
 ConditionPathExists=!/run/openbmc/mpreboot@%i