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/sensors | |
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/sensors')
3 files changed, 6 insertions, 3 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service b/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service index 4fa5a5a756..92f68dbbca 100644 --- a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service +++ b/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service @@ -3,7 +3,8 @@ Description=Phosphor Sensor Manager [Service] Restart=always -ExecStart={sbindir}/sensor_manager2.py +ExecStart=/usr/bin/env sensor_manager2.py +SyslogIdentifier=sensor_manager2.py Type=dbus BusName={BUSNAME} Environment="PYTHONUNBUFFERED=1" diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service index 1bfda83128..d9de6c0810 100644 --- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service +++ b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service @@ -6,5 +6,6 @@ After=mapper-wait@-xyz-openbmc_project-inventory.service [Service] Type=oneshot -ExecStart={bindir}/max31785-msl -p "${{PATHS}}" -b ${{BUS}} -r ${{REVISION}} +ExecStart=/usr/bin/env max31785-msl -p "${{PATHS}}" -b ${{BUS}} -r ${{REVISION}} EnvironmentFile={envfiledir}/obmc/hwmon-max31785/%I.conf +SyslogIdentifier=max31785-msl diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service index a091f1a598..8dca3ad4be 100644 --- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service +++ b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service @@ -6,5 +6,6 @@ After=xyz.openbmc_project.ObjectMapper.service [Service] Restart=always -ExecStart={sbindir}/phosphor-hwmon-readd -o %f +ExecStart=/usr/bin/env phosphor-hwmon-readd -o %f +SyslogIdentifier=phosphor-hwmon-readd EnvironmentFile=/etc/default/obmc/hwmon/%I.conf |