diff options
| author | Michael Tritz <mtritz@us.ibm.com> | 2017-08-15 14:07:23 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-24 21:14:19 +0000 |
| commit | 0ad3b1df9079064491c8318bece22e63cc71b2f4 (patch) | |
| tree | a7321a843e14fadb541f92aa965740e02015ebdd /meta-phosphor/common/recipes-phosphor/dbus | |
| parent | 0c75c0b0f709aaa9e56033c19daf8d074c7aeb6d (diff) | |
| download | talos-openbmc-0ad3b1df9079064491c8318bece22e63cc71b2f4.tar.gz talos-openbmc-0ad3b1df9079064491c8318bece22e63cc71b2f4.zip | |
Enable BMC patching from the /usr/local path
This commit enables patches from the /usr/local path by replacing
absolute paths to /usr/sbin or /usr/bin in every service file with
"/usr/bin/env ". Additionally, SyslogIdentifier is added to each
file to ensure that journal entries are still distinct.
In two cases, service files also had to change due to references
to ${{PATH}}, which doesn't work with /usr/bin/env. These
references - and the corresponding definitions - were changed to
${{DEVPATH}}.
Resolves openbmc/openbmc#2149
Change-Id: I12c5c6e5101eef6820b985a563313836250ff2c7
Signed-off-by: Michael Tritz <mtritz@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/dbus')
5 files changed, 10 insertions, 5 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service index a98503059..9440f0c2d 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service +++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service @@ -4,7 +4,8 @@ After=obmc-mapper.target [Service] Restart=always -ExecStart={sbindir}/phosphor-dbus-monitor +ExecStart=/usr/bin/env phosphor-dbus-monitor +SyslogIdentifier=phosphor-dbus-monitor [Install] WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service index 2ef074077..cbefdeab1 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service +++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service @@ -6,4 +6,5 @@ Wants=mapper-wait@-xyz-openbmc_project-inventory.service [Service] Type=oneshot RemainAfterExit=yes -ExecStart={sbindir}/phosphor-msl-verify +ExecStart=/usr/bin/env phosphor-msl-verify +SyslogIdentifier=phosphor-msl-verify diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service index 75dd9ab16..8781073d8 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service +++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service @@ -7,4 +7,5 @@ After=obmc-mapper.target Type=oneshot RemainAfterExit=no Restart=no -ExecStart={sbindir}/mapper subtree-remove %I +ExecStart=/usr/bin/env mapper subtree-remove %I +SyslogIdentifier=mapper diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service index d91909156..14a657ab2 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service +++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service @@ -7,4 +7,5 @@ After=obmc-mapper.target Type=oneshot RemainAfterExit=yes Restart=no -ExecStart={sbindir}/mapper wait %I +ExecStart=/usr/bin/env mapper wait %I +SyslogIdentifier=mapper diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service index ccaaa989f..820a42b07 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service +++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service @@ -5,11 +5,12 @@ Before=obmc-mapper.target [Service] Restart=always Type=dbus -ExecStart={sbindir}/phosphor-mapper \ +ExecStart=/usr/bin/env phosphor-mapper \ --path_namespaces="${{MAPPER_NAMESPACES}}" \ --interface_namespaces="${{MAPPER_INTERFACES}}" \ --blacklists="${{MAPPER_BLACKLISTS}}" \ --interface_blacklists="${{MAPPER_INTERFACEBLACKLISTS}}" +SyslogIdentifier=phosphor-mapper BusName={BUSNAME} TimeoutStartSec=300 EnvironmentFile={envfiledir}/obmc/mapper |
