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-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
index 51eec7f..39da992 100644
--- a/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
@@ -6,7 +6,8 @@
ConditionPathExists=!/run/openbmc/chassis@%i-on
[Service]
-ExecStart={bindir}/zaius_avsbus.sh disable
+ExecStart=/usr/bin/env zaius_avsbus.sh disable
+SyslogIdentifier=zaius_avsbus.sh
Type=oneshot
RemainAfterExit=yes
diff --git a/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
index b945529..24aadf5 100644
--- a/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ b/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -6,8 +6,9 @@
ConditionPathExists=!/run/openbmc/chassis@%i-on
[Service]
-ExecStart={bindir}/zaius_avsbus.sh vdn_max
-ExecStart={bindir}/zaius_avsbus.sh enable
+ExecStart=/usr/bin/env zaius_avsbus.sh vdn_max
+ExecStart=/usr/bin/env zaius_avsbus.sh enable
+SyslogIdentifier=zaius_avsbus.sh
Type=oneshot
RemainAfterExit=yes
diff --git a/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service b/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
index 5dd0b10..9444b36 100644
--- a/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
+++ b/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
@@ -12,7 +12,8 @@
Restart=no
Type=oneshot
RemainAfterExit=yes
-ExecStart={sbindir}/fix_zaius_refclock.sh
+ExecStart=/usr/bin/env fix_zaius_refclock.sh
+SyslogIdentifier=fix_zaius_refclock.sh
[Install]
RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service b/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service
index 1ca6215..f809ca4 100644
--- a/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service
+++ b/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service
@@ -5,7 +5,8 @@
Conflicts=obmc-host-start@%i.target
[Service]
-ExecStart={bindir}/zaius_vcs.sh off
+ExecStart=/usr/bin/env zaius_vcs.sh off
+SyslogIdentifier=zaius_vcs.sh
Type=oneshot
RemainAfterExit=yes
diff --git a/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service b/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
index 74b8df3..17c7cf6 100644
--- a/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
+++ b/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
@@ -7,7 +7,8 @@
Conflicts=obmc-host-stop@%i.target
[Service]
-ExecStart={bindir}/zaius_vcs.sh on
+ExecStart=/usr/bin/env zaius_vcs.sh on
+SyslogIdentifier=zaius_vcs.sh
Type=oneshot
RemainAfterExit=yes