| 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/host/obmc-op-control-host/op-init-pnor@.service b/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service index 5accb48..26a0343 100644 --- a/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service +++ b/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service
@@ -9,7 +9,8 @@ Type=oneshot RemainAfterExit=yes # TODO openbmc/openbmc#1598 - Delete this service once available -ExecStart={sbindir}/pflash -i +ExecStart=/usr/bin/env pflash -i +SyslogIdentifier=pflash [Install] WantedBy=obmc-host-start@%i.target
diff --git a/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service index c9d1a7c..2617941 100644 --- a/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service +++ b/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
@@ -14,7 +14,8 @@ [Service] Type=oneshot RemainAfterExit=yes -ExecStart={sbindir}/mapper call /org/openbmc/control/host%i org.openbmc.control.Host boot +ExecStart=/usr/bin/env mapper call /org/openbmc/control/host%i org.openbmc.control.Host boot +SyslogIdentifier=mapper [Install] WantedBy=obmc-host-start@%i.target
diff --git a/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service b/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service index 59d0c3d..9a64002 100644 --- a/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service +++ b/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
@@ -5,7 +5,8 @@ [Service] Restart=always -ExecStart={sbindir}/control_host.exe +ExecStart=/usr/bin/env control_host.exe +SyslogIdentifier=control_host.exe Type=dbus BusName={BUSNAME}