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/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service b/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
index 1253bcc..f5abfb5 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/btbridged
+ExecStart=/usr/bin/env btbridged
+SyslogIdentifier=btbridged
Type=dbus
BusName={BUSNAME}
diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service b/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
index ee83c7e..4bae65d 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
@@ -7,7 +7,8 @@
Restart=no
Type=oneshot
EnvironmentFile={envfiledir}/obmc/eeproms/%I
-ExecStart={sbindir}/phosphor-read-eeprom --eeprom $SYSFS_PATH --fruid $FRUID
+ExecStart=/usr/bin/env phosphor-read-eeprom --eeprom $SYSFS_PATH --fruid $FRUID
+SyslogIdentifier=phosphor-read-eeprom
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
index aec95b8..0cccfcd 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
@@ -17,7 +17,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/ipmid
+ExecStart=/usr/bin/env ipmid
+SyslogIdentifier=ipmid
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
index 7aee76f..600c86a 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
@@ -9,5 +9,6 @@
[Service]
Restart=no
-ExecStart={sbindir}/phosphor-softpoweroff
+ExecStart=/usr/bin/env phosphor-softpoweroff
+SyslogIdentifier=phosphor-softpoweroff
Type=oneshot
diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service b/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
index bdda6cc..3d346c5 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
@@ -11,5 +11,6 @@
After=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service
[Service]
-ExecStart={sbindir}/netipmid
+ExecStart=/usr/bin/env netipmid
+SyslogIdentifier=netipmid
Restart=always