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-openbmc-machines/meta-openpower/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-openbmc-machines/meta-openpower/common/recipes-phosphor/host')
3 files changed, 6 insertions, 3 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service index 4433fd0fd..221bcebf4 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service @@ -11,7 +11,8 @@ ConditionPathExists=!/run/openbmc/chassis@%i-on ConditionPathExists=/var/lib/obmc/cfam_overrides [Service] -ExecStart={sbindir}/openpower-proc-control CFAMOverride +ExecStart=/usr/bin/env openpower-proc-control CFAMOverride +SyslogIdentifier=openpower-proc-control Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service index af26186c3..77a88e864 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service @@ -10,7 +10,8 @@ Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/host@%i-on [Service] -ExecStart={sbindir}/openpower-proc-control startHost +ExecStart=/usr/bin/env openpower-proc-control startHost +SyslogIdentifier=openpower-proc-control Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service index acad945a5..d7d9f12c4 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service @@ -10,7 +10,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={sbindir}/openpower-proc-control vcsWorkaround +ExecStart=/usr/bin/env openpower-proc-control vcsWorkaround +SyslogIdentifier=openpower-proc-control Type=oneshot RemainAfterExit=yes |