diff options
| author | Michael Tritz <mtritz@us.ibm.com> | 2017-08-15 22:07:23 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-25 00:14:19 +0300 |
| commit | 0ad3b1df9079064491c8318bece22e63cc71b2f4 (patch) | |
| tree | a7321a843e14fadb541f92aa965740e02015ebdd /meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan | |
| parent | 0c75c0b0f709aaa9e56033c19daf8d074c7aeb6d (diff) | |
| download | openbmc-0ad3b1df9079064491c8318bece22e63cc71b2f4.tar.xz | |
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/fans/obmc-control-fan')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service | 3 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service index ad0db5cd34..c426c445d7 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service +++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service @@ -7,4 +7,5 @@ After=obmc-fan-control.target [Service] Type=oneshot Restart=no -ExecStart={sbindir}/mapper call /org/openbmc/control/fans org.openbmc.control.Fans setMax +ExecStart=/usr/bin/env mapper call /org/openbmc/control/fans org.openbmc.control.Fans setMax +SyslogIdentifier=mapper diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service index 0c10b09d17..ec6391d5cf 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service +++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service @@ -7,7 +7,8 @@ Before=obmc-fan-control.target [Service] Restart=always -ExecStart={sbindir}/fan_control.exe -f 6 +ExecStart=/usr/bin/env fan_control.exe -f 6 +SyslogIdentifier=fan_control.exe Type=dbus BusName={BUSNAME} Environment="PYTHONUNBUFFERED=1" |