From 568781e5a805edcb805a306733c10b6588b4165f Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Thu, 7 Apr 2022 16:46:36 -0500 Subject: meta-ibm: Use proper path names in service files Don't use /usr/bin/env, it's an antipattern. Signed-off-by: Matt Spinler Change-Id: If388f5427bb2ca45718d0ca99452bf3f147861dd --- .../recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service | 3 +-- .../recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service | 3 +-- .../recipes-phosphor/chassis/vrm-control/vrm-control@.service | 3 +-- .../recipes-phosphor/gpio/id-button/id-button-pressed.service | 3 +-- .../chassis/avsbus-control/mihawk/avsbus-disable@.service | 3 +-- .../chassis/avsbus-control/mihawk/avsbus-enable@.service | 3 +-- .../chassis/avsbus-control/witherspoon/avsbus-disable@.service | 3 +-- .../chassis/avsbus-control/witherspoon/avsbus-enable@.service | 3 +-- .../chassis/power-workarounds/witherspoon/power-workarounds@.service | 3 +-- meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control@.service | 3 +-- meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service | 3 +-- .../power/phosphor-power/mihawk/pseq-monitor-pgood.service | 3 +-- .../power/phosphor-power/witherspoon/pseq-monitor-pgood.service | 3 +-- .../power/witherspoon-power-supply-sync/power-supply-sync.service | 3 +-- 14 files changed, 14 insertions(+), 28 deletions(-) diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index 38c1e850b0..3aedd16e0d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service @@ -7,8 +7,7 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart=/usr/bin/env avsbus-disable.sh -SyslogIdentifier=avsbus-disable.sh +ExecStart=/usr/bin/avsbus-disable.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index b7fb41e245..782590e5e1 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -6,8 +6,7 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart=/usr/bin/env avsbus-enable.sh -SyslogIdentifier=avsbus-enable.sh +ExecStart=/usr/bin/avsbus-enable.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service index 22f0aeb877..9f45902eb4 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service @@ -7,8 +7,7 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart=/usr/bin/env vrm.sh -SyslogIdentifier=vrm.sh +ExecStart=/usr/bin/vrm.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/id-button-pressed.service b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/id-button-pressed.service index f633fc3076..c4f939cc36 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/id-button-pressed.service +++ b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/id-button-pressed.service @@ -6,5 +6,4 @@ StartLimitIntervalSec=0 [Service] Type=oneshot -ExecStart=/usr/bin/env toggle_identify_led.sh -SyslogIdentifier=id-button +ExecStart=/usr/bin/toggle_identify_led.sh diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service index 5396948bc9..c343fa1493 100644 --- a/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service @@ -7,8 +7,7 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart=/usr/bin/env avsbus-disable.sh -SyslogIdentifier=avsbus-disable.sh +ExecStart=/usr/bin/avsbus-disable.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service index 34d9e4b0f9..d79c55d84d 100644 --- a/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service @@ -6,8 +6,7 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart=/usr/bin/env avsbus-enable.sh -SyslogIdentifier=avsbus-enable.sh +ExecStart=/usr/bin/avsbus-enable.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service index 859f428836..be8d955bc5 100644 --- a/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service @@ -7,8 +7,7 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart=/usr/bin/env avsbus-disable.sh -SyslogIdentifier=avsbus-disable.sh +ExecStart=/usr/bin/avsbus-disable.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service index b7fb41e245..782590e5e1 100644 --- a/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service @@ -6,8 +6,7 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart=/usr/bin/env avsbus-enable.sh -SyslogIdentifier=avsbus-enable.sh +ExecStart=/usr/bin/avsbus-enable.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service b/meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service index 3bd1287ee7..8a11fcadd9 100644 --- a/meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service @@ -8,8 +8,7 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart=/usr/bin/env power-workarounds.sh -SyslogIdentifier=power-workarounds.sh +ExecStart=/usr/bin/power-workarounds.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control@.service index 731ce55c34..6037debd95 100644 --- a/meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control@.service +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control@.service @@ -7,8 +7,7 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart=/usr/bin/env vrm-control.sh vdna=0.9 vdnb=0.9 -SyslogIdentifier=vrm-control.sh +ExecStart=/usr/bin/vrm-control.sh vdna=0.9 vdnb=0.9 Type=oneshot RemainAfterExit=yes diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service b/meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service index 57ebc99731..ab6eddb1ca 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service @@ -4,8 +4,7 @@ After=xyz.openbmc_project.Logging.service BindsTo=xyz.openbmc_project.Logging.service [Service] -ExecStart=/usr/bin/env ibm-log-manager -SyslogIdentifier=ibm-log-manager +ExecStart=/usr/bin/ibm-log-manager Restart=always Type=dbus BusName={BUSNAME} diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/pseq-monitor-pgood.service b/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/pseq-monitor-pgood.service index af748cbca1..c3c682f434 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/pseq-monitor-pgood.service +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/pseq-monitor-pgood.service @@ -9,5 +9,4 @@ ConditionPathExists=!/run/openbmc/chassis@0-on [Service] Type=oneshot -ExecStart=/usr/bin/env pseq-monitor -a pgood-monitor -i 10000 -SyslogIdentifier=pseq-monitor +ExecStart=/usr/bin/pseq-monitor -a pgood-monitor -i 10000 diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service index 458c5e6d7f..412b8b28ae 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service @@ -9,5 +9,4 @@ ConditionPathExists=!/run/openbmc/chassis@0-on [Service] Type=oneshot -ExecStart=/usr/bin/env pseq-monitor -a pgood-monitor -i 5000 -SyslogIdentifier=pseq-monitor +ExecStart=/usr/bin/pseq-monitor -a pgood-monitor -i 5000 diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service index 9e342367b6..94dd45f4ba 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service +++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service @@ -7,8 +7,7 @@ Before=obmc-chassis-poweron@0.target ConditionPathExists=!/run/openbmc/chassis@0-on [Service] -ExecStart=/usr/bin/env phosphor-gpio-util --gpio=105 --path=/dev/gpiochip0 --delay=5 --action=low_high -SyslogIdentifier=power-supply-sync +ExecStart=/usr/bin/phosphor-gpio-util --gpio=105 --path=/dev/gpiochip0 --delay=5 --action=low_high [Install] RequiredBy=obmc-chassis-poweron@0.target -- cgit v1.2.3