| commit | fbd81be13b86c13757db86d6b63de2f2dfbd9797 | [log] [tgz] |
|---|---|---|
| author | Michael Tritz <mtritz@us.ibm.com> | Tue Aug 15 14:07:23 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Thu Aug 24 21:14:19 2017 +0000 |
| tree | fb6d643e5ecaad46cb648ed59fd3a54d8aa88e74 | |
| parent | 1ac52c805aded462dfe6edc7fcc2220b65f2c3ca [diff] |
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>
diff --git a/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service index 75dd9ab..8781073 100644 --- a/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service +++ b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
@@ -7,4 +7,5 @@ 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/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service index d919091..14a657a 100644 --- a/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service +++ b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
@@ -7,4 +7,5 @@ Type=oneshot RemainAfterExit=yes Restart=no -ExecStart={sbindir}/mapper wait %I +ExecStart=/usr/bin/env mapper wait %I +SyslogIdentifier=mapper
diff --git a/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service index ccaaa98..820a42b 100644 --- a/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service +++ b/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
@@ -5,11 +5,12 @@ [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