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-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
index ca92562..424aa23 100644
--- a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/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-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
index 60297d9..b7fb41e 100644
--- a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ b/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-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
index 5c2813a..156ef03 100644
--- a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
+++ b/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
diff --git a/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service b/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service
index e312a96..c59461e 100644
--- a/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service
+++ b/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service
@@ -5,7 +5,8 @@
Conflicts=obmc-chassis-poweron@%i.target
[Service]
-ExecStart={bindir}/cpld_reset.sh
+ExecStart=/usr/bin/env cpld_reset.sh
+SyslogIdentifier=cpld_reset.sh
Type=oneshot
RemainAfterExit=yes
diff --git a/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service b/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
index 57c5a8f..b240b3e 100644
--- a/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
+++ b/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
@@ -7,7 +7,8 @@
Conflicts=obmc-chassis-poweroff@%i.target
[Service]
-ExecStart={bindir}/cpld_trigger.sh
+ExecStart=/usr/bin/env cpld_trigger.sh
+SyslogIdentifier=cpld_trigger.sh
Type=oneshot
RemainAfterExit=yes
diff --git a/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service
index d5bdddb..5d072ad 100644
--- a/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service
+++ b/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service
@@ -6,7 +6,8 @@
Conflicts=obmc-chassis-poweroff@%i.target
[Service]
-ExecStart={bindir}/vrm.sh
+ExecStart=/usr/bin/env vrm.sh
+SyslogIdentifier=vrm.sh
Type=oneshot
RemainAfterExit=yes