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/state/files/phosphor-discover-system-state@.service b/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
index 4e34396..a959311 100644
--- a/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
+++ b/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
@@ -11,7 +11,8 @@
[Service]
Restart=no
Type=oneshot
-ExecStart={sbindir}/phosphor-discover-system-state --host %i
+ExecStart=/usr/bin/env phosphor-discover-system-state --host %i
+SyslogIdentifier=phosphor-discover-system-state
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service b/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
index f480cc5..6062320 100644
--- a/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
+++ b/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
@@ -12,8 +12,8 @@
[Service]
RemainAfterExit=yes
Type=oneshot
-ExecStart=/usr/sbin/phosphor-host-check
-
+ExecStart=/usr/bin/env phosphor-host-check
+SyslogIdentifier=phosphor-host-check
[Install]
WantedBy=obmc-host-reset@%i.target
diff --git a/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
index e3034e3..5224c98 100644
--- a/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
+++ b/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
@@ -5,7 +5,8 @@
Before=mapper-wait@-xyz-openbmc_project-state-bmc.service
[Service]
-ExecStart={sbindir}/phosphor-bmc-state-manager
+ExecStart=/usr/bin/env phosphor-bmc-state-manager
+SyslogIdentifier=phosphor-bmc-state-manager
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service b/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
index 5133fad..9a467eb 100644
--- a/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
+++ b/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
@@ -5,7 +5,8 @@
Before=mapper-wait@-xyz-openbmc_project-state-chassis.service
[Service]
-ExecStart={sbindir}/phosphor-chassis-state-manager
+ExecStart=/usr/bin/env phosphor-chassis-state-manager
+SyslogIdentifier=phosphor-chassis-state-manager
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
index 9adeed9..a70257e 100644
--- a/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
+++ b/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
@@ -8,7 +8,8 @@
After=phosphor-reset-host-running@0.service
[Service]
-ExecStart={sbindir}/phosphor-host-state-manager
+ExecStart=/usr/bin/env phosphor-host-state-manager
+SyslogIdentifier=phosphor-host-state-manager
Restart=always
Type=dbus
BusName={BUSNAME}