Host.Updater.service: Move dependency on ubi service to the ubi service

The org.open_power.Software.Host.Updater.service is a service common to the
static and ubi layout, but it had a dependency on a ubi service. It doesn't
cause a failure on the static layout because the dependency is a Wants vs
a Required, but it should not be there. Move the dependency instead to the
ubi service.

Tested: Verified on witherspoon that the
org.open_power.Software.Host.Updater.service started followed by the
obmc-flash-bios-ubipatch.service as it did before.

Change-Id: I9c850e312d0b11faaf2a08db6b3ccb17cdfcbcb6
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/org.open_power.Software.Host.Updater.service b/org.open_power.Software.Host.Updater.service
index 82654bf..94f9cab 100644
--- a/org.open_power.Software.Host.Updater.service
+++ b/org.open_power.Software.Host.Updater.service
@@ -3,8 +3,6 @@
 Wants=xyz.openbmc_project.Software.Version.service
 Before=xyz.openbmc_project.Software.Version.service
 Before=mboxd.service
-Wants=obmc-flash-bios-ubipatch.service
-Before=obmc-flash-bios-ubipatch.service
 Wants=obmc-mapper.target
 After=obmc-mapper.target
 
diff --git a/ubi/obmc-flash-bios-ubipatch.service b/ubi/obmc-flash-bios-ubipatch.service
index 0c55962..9e7ef15 100644
--- a/ubi/obmc-flash-bios-ubipatch.service
+++ b/ubi/obmc-flash-bios-ubipatch.service
@@ -3,8 +3,12 @@
 Before=mboxd.service
 Wants=usr-local.mount
 After=usr-local.mount
+After=org.open_power.Software.Host.Updater.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=no
 ExecStart=/usr/bin/obmc-flash-bios ubimount pnor-patch
+
+[Install]
+WantedBy=org.open_power.Software.Host.Updater.service