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/settings | |
| 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/settings')
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service index 8b4be9c7c..50e21665c 100644 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service +++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service @@ -2,7 +2,8 @@ Description=Phosphor Settings Daemon [Service] -ExecStart={sbindir}/phosphor-settings-manager +ExecStart=/usr/bin/env phosphor-settings-manager +SyslogIdentifier=phosphor-settings-manager Restart=always Type=dbus BusName={BUSNAME} diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service index d3480164f..b0f4a5d28 100644 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service +++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service @@ -5,7 +5,8 @@ Wants=obmc-mapper.target After=obmc-mapper.target [Service] -ExecStart={sbindir}/settings_manager.py +ExecStart=/usr/bin/env settings_manager.py +SyslogIdentifier=settings_manager.py Environment="PYTHONUNBUFFERED=1" Restart=always Type=dbus |
