summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdriana Kobylak <anoo@us.ibm.com>2019-10-28 13:31:47 -0500
committerAdriana Kobylak <anoo@us.ibm.com>2019-10-28 14:11:08 -0500
commit59d5657643c1cd24de579867abff1dcfa54d3803 (patch)
tree47127743e9db3faacfc4c5682a25ee1120121610
parentf3dfe65de8487364c21b7b49396cf912821ea339 (diff)
downloadopenpower-pnor-code-mgmt-59d5657643c1cd24de579867abff1dcfa54d3803.tar.gz
openpower-pnor-code-mgmt-59d5657643c1cd24de579867abff1dcfa54d3803.zip
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>
-rw-r--r--org.open_power.Software.Host.Updater.service2
-rw-r--r--ubi/obmc-flash-bios-ubipatch.service4
2 files changed, 4 insertions, 2 deletions
diff --git a/org.open_power.Software.Host.Updater.service b/org.open_power.Software.Host.Updater.service
index 82654bfcd..94f9cabb0 100644
--- a/org.open_power.Software.Host.Updater.service
+++ b/org.open_power.Software.Host.Updater.service
@@ -3,8 +3,6 @@ Description=OpenPower Software Update Manager
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 0c559620d..9e7ef1538 100644
--- a/ubi/obmc-flash-bios-ubipatch.service
+++ b/ubi/obmc-flash-bios-ubipatch.service
@@ -3,8 +3,12 @@ Description=Create a ubi volume for pnor patches
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
OpenPOWER on IntegriCloud