commit | ebfbc5d94e7d2df88dbe90c6e54d85af54a7a853 | [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 | 8e203f3455d91d1186d2a9dd7abaf4f9168a513b | |
parent | 2d8948b787709af02093f02441a423b445278863 [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-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index ca92562..424aa23 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-ibm/meta-romulus/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-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index 60297d9..b7fb41e 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -6,7 +6,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-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service index 5c2813a..156ef03 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
@@ -7,7 +7,8 @@ ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/avsbus-workaround.sh +ExecStart=/usr/bin/env avsbus-workaround.sh +SyslogIdentifier=avsbus-workaround.sh Type=oneshot RemainAfterExit=yes