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/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service b/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
index a985030..9440f0c 100644
--- a/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
+++ b/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
@@ -4,7 +4,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/phosphor-dbus-monitor
+ExecStart=/usr/bin/env phosphor-dbus-monitor
+SyslogIdentifier=phosphor-dbus-monitor
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service b/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
index 2ef0740..cbefdea 100644
--- a/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
+++ b/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
@@ -6,4 +6,5 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart={sbindir}/phosphor-msl-verify
+ExecStart=/usr/bin/env phosphor-msl-verify
+SyslogIdentifier=phosphor-msl-verify
diff --git a/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
index 75dd9ab..8781073 100644
--- a/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
+++ b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
@@ -7,4 +7,5 @@
Type=oneshot
RemainAfterExit=no
Restart=no
-ExecStart={sbindir}/mapper subtree-remove %I
+ExecStart=/usr/bin/env mapper subtree-remove %I
+SyslogIdentifier=mapper
diff --git a/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
index d919091..14a657a 100644
--- a/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
+++ b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
@@ -7,4 +7,5 @@
Type=oneshot
RemainAfterExit=yes
Restart=no
-ExecStart={sbindir}/mapper wait %I
+ExecStart=/usr/bin/env mapper wait %I
+SyslogIdentifier=mapper
diff --git a/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
index ccaaa98..820a42b 100644
--- a/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
+++ b/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
@@ -5,11 +5,12 @@
[Service]
Restart=always
Type=dbus
-ExecStart={sbindir}/phosphor-mapper \
+ExecStart=/usr/bin/env phosphor-mapper \
--path_namespaces="${{MAPPER_NAMESPACES}}" \
--interface_namespaces="${{MAPPER_INTERFACES}}" \
--blacklists="${{MAPPER_BLACKLISTS}}" \
--interface_blacklists="${{MAPPER_INTERFACEBLACKLISTS}}"
+SyslogIdentifier=phosphor-mapper
BusName={BUSNAME}
TimeoutStartSec=300
EnvironmentFile={envfiledir}/obmc/mapper