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/host | |
| 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/host')
3 files changed, 6 insertions, 3 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service index 5accb4899..26a0343f1 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service @@ -9,7 +9,8 @@ ConditionPathExists=!/run/openbmc/host@%i-on 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/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service index c9d1a7c5c..261794133 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service @@ -14,7 +14,8 @@ ConditionPathExists=!/run/openbmc/host@%i-on [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/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service index 59d0c3d9e..9a64002ec 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service @@ -5,7 +5,8 @@ After=mapper-wait@-org-openbmc-managers-System.service [Service] Restart=always -ExecStart={sbindir}/control_host.exe +ExecStart=/usr/bin/env control_host.exe +SyslogIdentifier=control_host.exe Type=dbus BusName={BUSNAME} |
