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>

2 files changed, 4 insertions, 2 deletions

diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
index 6206bb3b1..7fb2a5bc3 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
+++ b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
@@ -7,7 +7,8 @@ Conflicts=obmc-chassis-poweroff@%i.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart={sbindir}/mboxctl --reset
+ExecStart=/usr/bin/env mboxctl --reset
+SyslogIdentifier=mboxctl
 
 [Install]
 WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service
index 8adf56696..35081d85a 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service
+++ b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service
@@ -8,7 +8,8 @@ After=dev-aspeed\x2dmbox.device
 
 [Service]
 Restart=always
-ExecStart={sbindir}/mboxd --flash {FLASH_SIZE} --window-size 1M
+ExecStart=/usr/bin/env mboxd --flash {FLASH_SIZE} --window-size 1M
+SyslogIdentifier=mboxd
 
 [Install]
 WantedBy={SYSTEMD_DEFAULT_TARGET}