| commit | 93e553380e00a403c1855cfcc16885aed4b23b04 | [log] [tgz] |
|---|---|---|
| author | Matt Spinler <spinler@us.ibm.com> | Thu Apr 07 16:02:32 2022 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Fri Apr 29 21:02:21 2022 +0000 |
| tree | e676c0c1c8a3a9267fa879e5795ef744ce763ec9 | |
| parent | cc2a1cdaa816be573d8ea8f1ceb1bfa5f37a20d0 [diff] |
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
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 4fad8fa..835c947 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 @@ 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 d613090..06e2e46 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 @@ 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 5f7bd95..d57ec31 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 @@ [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