| commit | bc3818e94f902bb92e4fc268347ad28601502f3d | [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 | 6555f7df6e579a73232a9b3e200ca0891ba89292 | |
| parent | 8375eacaa054f95ee00f74332db04634d220e32b [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/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index 90e8b03..859f428 100644 --- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
@@ -7,7 +7,8 @@ ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/avsbus-disable.sh +ExecStart=/usr/bin/env avsbus-disable.sh +SyslogIdentifier=avsbus-disable.sh Type=oneshot RemainAfterExit=yes
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index 92d626e..99ff9e4 100644 --- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -7,7 +7,8 @@ ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/avsbus-enable.sh +ExecStart=/usr/bin/env avsbus-enable.sh +SyslogIdentifier=avsbus-enable.sh Type=oneshot RemainAfterExit=yes
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service index ec3017c..5e44755 100644 --- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service +++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service
@@ -7,7 +7,8 @@ ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/power-workarounds.sh +ExecStart=/usr/bin/env power-workarounds.sh +SyslogIdentifier=power-workarounds.sh Type=oneshot RemainAfterExit=yes