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/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service b/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
index 4893cd1..d9355b3 100644
--- a/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
+++ b/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
@@ -5,7 +5,8 @@
[Service]
Restart=no
-ExecStart={sbindir}/mapper call /org/openbmc/control/flash/bios org.openbmc.Flash init
+ExecStart=/usr/bin/env mapper call /org/openbmc/control/flash/bios org.openbmc.Flash init
+SyslogIdentifier=mapper
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service b/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
index fefd172..842add3 100644
--- a/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
+++ b/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
@@ -5,7 +5,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/flash_bios.exe
+ExecStart=/usr/bin/env flash_bios.exe
+SyslogIdentifier=flash_bios.exe
Type=dbus
BusName={BUSNAME}