diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2022-04-08 00:02:32 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-04-30 00:02:21 +0300 |
| commit | 93e553380e00a403c1855cfcc16885aed4b23b04 (patch) | |
| tree | e676c0c1c8a3a9267fa879e5795ef744ce763ec9 | |
| parent | cc2a1cdaa816be573d8ea8f1ceb1bfa5f37a20d0 (diff) | |
| download | openbmc-93e553380e00a403c1855cfcc16885aed4b23b04.tar.xz | |
Use proper paths in mapper services
Using /usr/bin/env is now an antipattern.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I18c05ea0f962b989ecbedc8019f63f673cb4b9ef
3 files changed, 3 insertions, 6 deletions
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service index 4fad8fad78..835c947bbe 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service @@ -8,5 +8,4 @@ Type=oneshot RemainAfterExit=no Restart=on-failure TimeoutStartSec=infinity -ExecStart=/usr/bin/env mapper subtree-remove %I -SyslogIdentifier=mapper +ExecStart=/usr/bin/mapper subtree-remove %I diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service index d61309097c..06e2e46509 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service @@ -8,5 +8,4 @@ Type=oneshot RemainAfterExit=yes Restart=on-failure TimeoutStartSec=infinity -ExecStart=/usr/bin/env mapper wait %I -SyslogIdentifier=mapper +ExecStart=/usr/bin/mapper wait %I diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service index 5f7bd95997..d57ec31299 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service @@ -6,11 +6,10 @@ After=dbus.service [Service] Restart=always Type=dbus -ExecStart=/usr/bin/env mapperx \ +ExecStart=/usr/bin/mapperx \ --service-namespaces="${{MAPPER_SERVICES}}" \ --interface-namespaces="${{MAPPER_INTERFACES}}" \ --service-blacklists="${{MAPPER_SERVICEBLACKLISTS}}" -SyslogIdentifier=phosphor-mapper BusName={BUSNAME} TimeoutStartSec=300 RestartSec=5 |