diff options
| author | Michael Tritz <mtritz@us.ibm.com> | 2017-08-15 14:07:23 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-24 21:14:19 +0000 |
| commit | 0ad3b1df9079064491c8318bece22e63cc71b2f4 (patch) | |
| tree | a7321a843e14fadb541f92aa965740e02015ebdd /meta-phosphor/common/recipes-phosphor/system | |
| parent | 0c75c0b0f709aaa9e56033c19daf8d074c7aeb6d (diff) | |
| download | talos-openbmc-0ad3b1df9079064491c8318bece22e63cc71b2f4.tar.gz talos-openbmc-0ad3b1df9079064491c8318bece22e63cc71b2f4.zip | |
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/system')
3 files changed, 6 insertions, 3 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service index 5a8c9a0ef..d4dacf546 100644 --- a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service +++ b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service @@ -3,7 +3,8 @@ Description=Phosphor System Manager [Service] Restart=always -ExecStart={sbindir}/obmc-phosphor-sysd +ExecStart=/usr/bin/env obmc-phosphor-sysd +SyslogIdentifier=obmc-phosphor-sysd [Install] WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service b/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service index 4d26f961b..9685efecd 100644 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service +++ b/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service @@ -3,7 +3,8 @@ Description=Phosphor BMC%i Control [Service] Restart=always -ExecStart={sbindir}/control_bmc.exe +ExecStart=/usr/bin/env control_bmc.exe +SyslogIdentifier=control_bmc.exe Type=dbus BusName={BUSNAME} diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service index abca0dc68..b5f6b3f2a 100644 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service +++ b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service @@ -5,7 +5,8 @@ After=obmc-mapper.target [Service] Restart=always -ExecStart={sbindir}/system_manager.py +ExecStart=/usr/bin/env system_manager.py +SyslogIdentifier=system_manager.py Type=dbus BusName={BUSNAME} Environment="PYTHONUNBUFFERED=1" |
