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/console | |
| 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/console')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service | 3 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service index f8fa7cc7c..82ffe7919 100644 --- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service +++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service @@ -5,7 +5,8 @@ Wants=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service [Service] Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" EnvironmentFile={envfiledir}/dropbear -ExecStart=-{sbindir}/dropbear -i -r ${{DROPBEAR_RSAKEY_DIR}}/dropbear_rsa_host_key -c {bindir}/obmc-console-client $DROPBEAR_EXTRA_ARGS +ExecStart=-/usr/bin/env dropbear -i -r ${{DROPBEAR_RSAKEY_DIR}}/dropbear_rsa_host_key -c "/usr/bin/env obmc-console-client" $DROPBEAR_EXTRA_ARGS +SyslogIdentifier=dropbear ExecReload={base_bindir}/kill -HUP $MAINPID StandardInput=socket KillMode=process diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service index e28b06933..26e452c3c 100644 --- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service +++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service @@ -4,7 +4,8 @@ BindsTo=dev-%i.device After=dev-%i.device [Service] -ExecStart={sbindir}/obmc-console-server --config {sysconfdir}/obmc-console.conf %i +ExecStart=/usr/bin/env obmc-console-server --config {sysconfdir}/obmc-console.conf %i +SyslogIdentifier=obmc-console-server Restart=always [Install] |