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
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 01b31b1..065cb46 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 @@
[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 be6ebae..98494b7 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 @@
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 543b852..c6fed5a 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 @@
[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 ec2cd68..03a1de7 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 @@
[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 6588191..0f9809d 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 @@
[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 5f26194..ff11d6e 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 @@
[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 012b0dd..16d372d 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 @@
[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 ff4dec5..627a8e4 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 @@
[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 5eeaf5c..7040b3e 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 @@
[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 f68f029..c816fac 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 @@
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 735d113..9a860f3 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 @@
[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 6588191..0f9809d 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 @@
[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 5f26194..ff11d6e 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 @@
[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 012b0dd..16d372d 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 @@
[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"