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/dump/phosphor-debug-collector/obmc-dump-monitor.service b/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service index b6e75f1..0e8ef3b 100644 --- a/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service +++ b/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
@@ -2,7 +2,8 @@ Description=Phosphor Dump core monitor. [Service] -ExecStart={sbindir}/phosphor-dump-monitor +ExecStart=/usr/bin/env phosphor-dump-monitor +SyslogIdentifier=phosphor-dump-monitor Restart=always [Install]
diff --git a/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service b/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service index 84f8232..131c8cd 100644 --- a/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service +++ b/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
@@ -3,7 +3,8 @@ [Service] ExecStartPre=/bin/sh -c 'mkdir -p {BMC_DUMP_PATH}' -ExecStart={sbindir}/phosphor-dump-manager +ExecStart=/usr/bin/env phosphor-dump-manager +SyslogIdentifier=phosphor-dump-manager Restart=always Type=dbus BusName={BUSNAME}