systemd: no installation in templated targets
Upstream yocto introduced a change via e510222 (systemd-systemctl:
fix instance template WantedBy symlink construction).
This fixes a bug that we in OpenBMC had been taking advantage of in that
we were able to document our templated target dependencies without it
actually doing anything. The real installation of services within
targets occurs in our bitbake recipes due to the complexity of chassis
and host instances on a per machine basis.
Leave the dependency information in the service files but comment them
out. It's useful to be able to look at a service and understand which
targets it's going to be installed into by the bitbake recipes.
In some cases, we had hard coded the target instance, which does install
the service correctly, but only in that one target. All services should
be installed via the bitbake recipe to ensure the service is properly
installed in all instances of the target (or service). Once the bump for
this commit goes into openbmc/openbmc, I will ensure the recipe is
updated to install all services correctly.
Change-Id: I6b1b3ebb9c1c3c2c5c03cf02ec5b74b9c2bcae2a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/vpnor/obmc-vpnor-check-clearvolatile@.service b/vpnor/obmc-vpnor-check-clearvolatile@.service
index c303721..c558bc5 100644
--- a/vpnor/obmc-vpnor-check-clearvolatile@.service
+++ b/vpnor/obmc-vpnor-check-clearvolatile@.service
@@ -10,4 +10,4 @@
ExecStart=/usr/bin/obmc-vpnor-util clearvolatile
[Install]
-RequiredBy=obmc-host-startmin@%i.target
+#RequiredBy=obmc-host-startmin@%i.target
diff --git a/vpnor/obmc-vpnor-enable-clearvolatile@.service b/vpnor/obmc-vpnor-enable-clearvolatile@.service
index 5fc3794..fe1a1a5 100644
--- a/vpnor/obmc-vpnor-enable-clearvolatile@.service
+++ b/vpnor/obmc-vpnor-enable-clearvolatile@.service
@@ -14,4 +14,4 @@
SyslogIdentifier=obmc-vpnor-enable-clearvolatile
[Install]
-RequiredBy=obmc-host-start@%i.target
+#RequiredBy=obmc-host-start@%i.target
diff --git a/vpnor/obmc-vpnor-updatesymlinks.service b/vpnor/obmc-vpnor-updatesymlinks.service
index 17392d3..4bbf826 100644
--- a/vpnor/obmc-vpnor-updatesymlinks.service
+++ b/vpnor/obmc-vpnor-updatesymlinks.service
@@ -16,4 +16,5 @@
[Install]
WantedBy=pldmd.service
-WantedBy=mboxd.service mboxd-reload@.service
+WantedBy=mboxd.service
+#WantedBy=mboxd-reload@.service