diff options
author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-04-07 12:26:32 +0300 |
---|---|---|
committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-04-10 04:41:27 +0300 |
commit | 90e792a45ac1ca2fbd237df40212308abe90c09f (patch) | |
tree | d97171c6b0cef29672e42f0443727424480544cd /meta-ampere | |
parent | d1d733b5bc0348de3752efeed45d1218cde62f37 (diff) | |
download | openbmc-90e792a45ac1ca2fbd237df40212308abe90c09f.tar.xz |
meta-ampere: remove env call from service file
We are suppose to use direct executable calls in service files
rather than indirections through /bin/env (See Anti-patterns).
Tested:
- Check related services to work like before
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: Idb494ce781fa1bdcac176cd89612e6016e6e04d9
Diffstat (limited to 'meta-ampere')
14 files changed, 14 insertions, 14 deletions
diff --git a/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service index 01b31b1b3c..065cb46bcc 100644 --- a/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service +++ b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service @@ -8,6 +8,6 @@ ConditionPathExists=!/lib/systemd/system/pldmSoftPowerOff.service [Service] Restart=no -ExecStart=/usr/bin/env phosphor-softpoweroff +ExecStart=/usr/bin/phosphor-softpoweroff SyslogIdentifier=phosphor-softpoweroff Type=oneshot diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service index be6ebaee17..98494b718f 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service +++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service @@ -4,7 +4,7 @@ Requires=xyz.openbmc_project.EntityManager.service After=xyz.openbmc_project.EntityManager.service [Service] -ExecStart=/usr/bin/env ampere_update_mac.sh eth1 3 80 +ExecStart=/usr/sbin/ampere_update_mac.sh eth1 3 80 SyslogIdentifier=ampere_update_mac.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service index 543b852946..c6fed5a6dd 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service @@ -5,5 +5,5 @@ Conflicts=obmc-chassis-poweron@%i.target [Service] Type=oneshot -ExecStart=/usr/bin/env ampere_gpio_utils.sh power off +ExecStart=/usr/sbin/ampere_gpio_utils.sh power off SyslogIdentifier=ampere_gpio_utils diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service index ec2cd68e20..03a1de7f7d 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service @@ -6,5 +6,5 @@ Conflicts=obmc-chassis-poweroff@%i.target [Service] Type=oneshot -ExecStart=/usr/bin/env ampere_gpio_utils.sh power on +ExecStart=/usr/sbin/ampere_gpio_utils.sh power on SyslogIdentifier=ampere_gpio_utils diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service index 6588191aae..0f9809d4bc 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service @@ -4,5 +4,5 @@ Conflicts=obmc-chassis-poweron@0.target [Service] Type=oneshot -ExecStart=/usr/bin/env ampere_power_util.sh mb shutdown_ack +ExecStart=/usr/sbin/ampere_power_util.sh mb shutdown_ack SyslogIdentifier=ampere_host_shutdown_ack diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service index 5f26194eb0..ff11d6ec26 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service @@ -3,4 +3,4 @@ Description=Ampere Computing LLC HighTempt event [Service] Restart=no -ExecStart=/usr/bin/env ampere_add_redfishevent.sh OpenBMC.0.1.AmpereEvent.Warning "CPU%i HighTemp asserted" +ExecStart=/usr/sbin/ampere_add_redfishevent.sh OpenBMC.0.1.AmpereEvent.Warning "CPU%i HighTemp asserted" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service index 012b0ddaf9..16d372db1e 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service @@ -3,4 +3,4 @@ Description=Ampere Computing LLC HighTempt event [Service] Restart=no -ExecStart=/usr/bin/env ampere_add_redfishevent.sh OpenBMC.0.1.AmpereEvent.OK "CPU%i HighTemp deasserted" +ExecStart=/usr/sbin/ampere_add_redfishevent.sh OpenBMC.0.1.AmpereEvent.OK "CPU%i HighTemp deasserted" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_scp_failover.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_scp_failover.service index ff4dec57a3..627a8e4089 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_scp_failover.service +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_scp_failover.service @@ -3,4 +3,4 @@ Description=Ampere Computing LLC Ampere failover event service [Service] Restart=no -ExecStart=/usr/bin/env ampere_scp_failover.sh +ExecStart=/usr/sbin/ampere_scp_failover.sh diff --git a/meta-ampere/meta-mitchell/recipes-ampere/host/ampere-sysfw-hang-handler/ampere-sysfw-hang-handler.service b/meta-ampere/meta-mitchell/recipes-ampere/host/ampere-sysfw-hang-handler/ampere-sysfw-hang-handler.service index 5eeaf5cc96..7040b3e8a5 100644 --- a/meta-ampere/meta-mitchell/recipes-ampere/host/ampere-sysfw-hang-handler/ampere-sysfw-hang-handler.service +++ b/meta-ampere/meta-mitchell/recipes-ampere/host/ampere-sysfw-hang-handler/ampere-sysfw-hang-handler.service @@ -6,7 +6,7 @@ ConditionPathExists=!/var/ampere/sysfw-hang-disable [Service] Type=simple -ExecStart=/usr/bin/env ampere_sysfw_hang_handler.sh +ExecStart=/usr/sbin/ampere_sysfw_hang_handler.sh SyslogIdentifier=ampere_sysfw_hang [Install] diff --git a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service index f68f029aed..c816fac6d2 100644 --- a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service +++ b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.service @@ -6,7 +6,7 @@ StartLimitInterval=25 StartLimitBurst=5 [Service] -ExecStart=/usr/bin/env ampere_update_mac.sh eth0 14 80 +ExecStart=/usr/sbin/ampere_update_mac.sh eth0 14 80 SyslogIdentifier=ampere_update_mac.sh RemainAfterExit=yes Restart=on-failure diff --git a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere-bmc-heartbeat.service b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere-bmc-heartbeat.service index 735d113e16..9a860f3d66 100644 --- a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere-bmc-heartbeat.service +++ b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere-bmc-heartbeat.service @@ -4,7 +4,7 @@ Description=Ampere BMC heartbeat service [Service] Type=simple Restart=always -ExecStart=/usr/bin/env ampere_bmc_heartbeat.sh +ExecStart=/usr/sbin/ampere_bmc_heartbeat.sh SyslogIdentifier = "ampere-bmc-heartbeat" [Install] diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service b/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service index 6588191aae..0f9809d4bc 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service +++ b/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere-host-shutdown-ack@.service @@ -4,5 +4,5 @@ Conflicts=obmc-chassis-poweron@0.target [Service] Type=oneshot -ExecStart=/usr/bin/env ampere_power_util.sh mb shutdown_ack +ExecStart=/usr/sbin/ampere_power_util.sh mb shutdown_ack SyslogIdentifier=ampere_host_shutdown_ack diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service b/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service index 5f26194eb0..ff11d6ec26 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service +++ b/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_start@.service @@ -3,4 +3,4 @@ Description=Ampere Computing LLC HighTempt event [Service] Restart=no -ExecStart=/usr/bin/env ampere_add_redfishevent.sh OpenBMC.0.1.AmpereEvent.Warning "CPU%i HighTemp asserted" +ExecStart=/usr/sbin/ampere_add_redfishevent.sh OpenBMC.0.1.AmpereEvent.Warning "CPU%i HighTemp asserted" diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service b/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service index 012b0ddaf9..16d372db1e 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service +++ b/meta-ampere/meta-mitchell/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_hightemp_stop@.service @@ -3,4 +3,4 @@ Description=Ampere Computing LLC HighTempt event [Service] Restart=no -ExecStart=/usr/bin/env ampere_add_redfishevent.sh OpenBMC.0.1.AmpereEvent.OK "CPU%i HighTemp deasserted" +ExecStart=/usr/sbin/ampere_add_redfishevent.sh OpenBMC.0.1.AmpereEvent.OK "CPU%i HighTemp deasserted" |