From 0ad3b1df9079064491c8318bece22e63cc71b2f4 Mon Sep 17 00:00:00 2001 From: Michael Tritz Date: Tue, 15 Aug 2017 14:07:23 -0500 Subject: 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 --- .../gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service | 3 ++- .../gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta-phosphor/common/recipes-phosphor/gpio') diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service index a4b0902d6..a9644a74d 100644 --- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service +++ b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service @@ -4,4 +4,5 @@ Description=Phosphor GPIO %I monitor [Service] Restart=no EnvironmentFile={envfiledir}/obmc/gpio/%I -ExecStart={sbindir}/phosphor-gpio-monitor --path=${{PATH}} --key=${{KEY}} --polarity=${{POLARITY}} --target=${{TARGET}} +ExecStart=/usr/bin/env phosphor-gpio-monitor --path=${{DEVPATH}} --key=${{KEY}} --polarity=${{POLARITY}} --target=${{TARGET}} +SyslogIdentifier=phosphor-gpio-monitor diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service index 7872ce69f..758a21f7f 100644 --- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service +++ b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service @@ -6,7 +6,8 @@ ConditionPathExists={envfiledir}/obmc/gpio/phosphor-power-supply-%i.conf [Service] EnvironmentFile={envfiledir}/obmc/gpio/phosphor-power-supply-%i.conf -ExecStart={sbindir}/phosphor-gpio-presence --path=${{PATH}} --inventory=${{INVENTORY}} --key=${{KEY}} --name=${{NAME}} +ExecStart=/usr/bin/env phosphor-gpio-presence --path=${{DEVPATH}} --inventory=${{INVENTORY}} --key=${{KEY}} --name=${{NAME}} +SyslogIdentifier=phosphor-gpio-presence [Install] RequiredBy={SYSTEMD_DEFAULT_TARGET} -- cgit v1.2.1