| commit | fbd81be13b86c13757db86d6b63de2f2dfbd9797 | [log] [tgz] |
|---|---|---|
| author | Michael Tritz <mtritz@us.ibm.com> | Tue Aug 15 14:07:23 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Thu Aug 24 21:14:19 2017 +0000 |
| tree | fb6d643e5ecaad46cb648ed59fd3a54d8aa88e74 | |
| parent | 1ac52c805aded462dfe6edc7fcc2220b65f2c3ca [diff] |
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/system/files/obmc-phosphor-sysd.service b/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service index 5a8c9a0..d4dacf5 100644 --- a/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service +++ b/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service
@@ -3,7 +3,8 @@ [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/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service b/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service index 4d26f96..9685efe 100644 --- a/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service +++ b/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
@@ -3,7 +3,8 @@ [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/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service b/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service index abca0dc..b5f6b3f 100644 --- a/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service +++ b/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
@@ -5,7 +5,8 @@ [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"