diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2023-06-27 21:33:53 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2023-07-05 18:39:43 +0300 |
commit | e8364f400821a1ef81c9533005733c59d909027a (patch) | |
tree | 30b1d2e7311fa5f4b0769d7add2a63840500a6ea /meta-phosphor/recipes-phosphor | |
parent | 0bfc05be2d1fe89d2967b8939c2ff50d399236fe (diff) | |
download | openbmc-e8364f400821a1ef81c9533005733c59d909027a.tar.xz |
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.
The service files are already properly installed into the appropriate
targets by the recipe.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Idcb5458b6f2a3007c20f546604d4095650148803
Diffstat (limited to 'meta-phosphor/recipes-phosphor')
2 files changed, 6 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-off@.service b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-off@.service index 092409e402..c7c44d16db 100644 --- a/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-off@.service +++ b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-off@.service @@ -18,4 +18,6 @@ ExecStart=/bin/rm -f /run/openbmc/host@%i-request ExecStart=/bin/rm -f /run/openbmc/mpreboot@%i [Install] -WantedBy=obmc-host-stop@%i.target +# Installation of templated services occur in bitbake recipes +# Leave it commented out here for documentation purposes +#WantedBy=obmc-host-stop@%i.target diff --git a/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-on@.service b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-on@.service index 8fe7cf767e..4458a49385 100644 --- a/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-on@.service +++ b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power/phosphor-wait-power-on@.service @@ -18,4 +18,6 @@ SyslogIdentifier=pgood_wait TimeoutSec=30 [Install] -WantedBy=obmc-host-start@%i.target +# Installation of templated services occur in bitbake recipes +# Leave it commented out here for documentation purposes +#WantedBy=obmc-host-start@%i.target |