diff options
| author | Michael Tritz <mtritz@us.ibm.com> | 2017-08-15 22:07:23 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-25 00:14:19 +0300 |
| commit | 0ad3b1df9079064491c8318bece22e63cc71b2f4 (patch) | |
| tree | a7321a843e14fadb541f92aa965740e02015ebdd /meta-phosphor/common/recipes-phosphor/state/files | |
| parent | 0c75c0b0f709aaa9e56033c19daf8d074c7aeb6d (diff) | |
| download | openbmc-0ad3b1df9079064491c8318bece22e63cc71b2f4.tar.xz | |
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>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/state/files')
5 files changed, 10 insertions, 6 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service index 4e3439658a..a959311ad7 100644 --- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service +++ b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service @@ -11,7 +11,8 @@ After=op-reset-chassis-on@%i.service [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/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service index f480cc5b74..6062320b20 100644 --- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service +++ b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service @@ -12,8 +12,8 @@ ConditionPathExists=/run/openbmc/chassis@%i-on [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/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service index e3034e3e74..5224c98fa6 100644 --- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service +++ b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service @@ -5,7 +5,8 @@ After=mapper-wait@-org-openbmc-managers-System.service 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/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service index 5133fad04a..9a467eb6c5 100644 --- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service +++ b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service @@ -5,7 +5,8 @@ After=mapper-wait@-org-openbmc-managers-System.service 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/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service index 9adeed9fb4..a70257e18a 100644 --- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service +++ b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service @@ -8,7 +8,8 @@ Before=mapper-wait@-xyz-openbmc_project-state-host.service 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} |