meta-openpower: Use proper paths in service files
Using /usr/bin/env is an antipattern.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I6b4f647a10fd8c261e2b42cfdae030749ded7c29
diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service
index 5e8cf3d..bac565b 100644
--- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service
+++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service
@@ -7,7 +7,6 @@
# before processing checkstop. OCC has to wait 5 seconds
# for our driver to stop using the SBEFIFO.
ExecStart={base_bindir}/sleep 10
-ExecStart=/usr/bin/env checkstop_app
-SyslogIdentifier=checkstop_app
+ExecStart=/usr/bin/checkstop_app
Type=oneshot
Restart=no
diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog-timeout@.service b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog-timeout@.service
index 55ba403..4f9870f 100644
--- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog-timeout@.service
+++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog-timeout@.service
@@ -3,7 +3,6 @@
Before=obmc-host-quiesce@%i.target
[Service]
-ExecStart=/usr/bin/env openpower-proc-control collectSBEHBData
-SyslogIdentifier=openpower-proc-control
+ExecStart=/usr/bin/openpower-proc-control collectSBEHBData
Type=oneshot
Restart=no
diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service
index 6826764..ca4e4af 100644
--- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service
+++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service
@@ -4,7 +4,6 @@
After=op-stop-instructions@%i.service
[Service]
-ExecStart=/usr/bin/env watchdog_timeout
-SyslogIdentifier=watchdog_timeout
+ExecStart=/usr/bin/watchdog_timeout
Type=oneshot
Restart=no
diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
index 0067679..1bf86aa 100644
--- a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
+++ b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
@@ -11,8 +11,7 @@
ConditionPathExists=!/run/openbmc/mpreboot@%i
[Service]
-ExecStart=/usr/bin/env openpower-proc-control scanFSI
-SyslogIdentifier=openpower-proc-control
+ExecStart=/usr/bin/openpower-proc-control scanFSI
Type=oneshot
RemainAfterExit=yes
diff --git a/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service b/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service
index 8b773ec..5f7cac7 100644
--- a/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service
+++ b/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service
@@ -12,8 +12,7 @@
ConditionPathExists=/var/lib/obmc/cfam_overrides
[Service]
-ExecStart=/usr/bin/env openpower-proc-control CFAMOverride
-SyslogIdentifier=openpower-proc-control
+ExecStart=/usr/bin/openpower-proc-control CFAMOverride
Type=oneshot
RemainAfterExit=yes
diff --git a/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service b/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service
index aa12be3..bfe8dbe 100644
--- a/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service
+++ b/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service
@@ -12,8 +12,7 @@
ConditionPathExists=!/run/openbmc/mpreboot@%i
[Service]
-ExecStart=/usr/bin/env openpower-proc-control startHost
-SyslogIdentifier=openpower-proc-control
+ExecStart=/usr/bin/openpower-proc-control startHost
Type=oneshot
RemainAfterExit=yes
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
index 8a6f2bb..2988a4d 100644
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
+++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
@@ -6,8 +6,7 @@
Conflicts=op-occ-enable@%i.service
[Service]
-ExecStart=/usr/bin/env occ-active.sh disable
-SyslogIdentifier=occ-active.sh
+ExecStart=/usr/bin/occ-active.sh disable
Type=oneshot
[Install]
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
index b97253c..5431101 100644
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
+++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
@@ -9,8 +9,7 @@
ConditionPathExists=/run/openbmc/host@%i-on
[Service]
-ExecStart=/usr/bin/env occ-active.sh enable
-SyslogIdentifier=occ-active.sh
+ExecStart=/usr/bin/occ-active.sh enable
Type=oneshot
[Install]
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
index 77fb5d3..ff4129a 100644
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
+++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
@@ -6,8 +6,7 @@
After=obmc-host-reset-running@0.target
[Service]
-ExecStart=/usr/bin/env openpower-occ-control
-SyslogIdentifier=openpower-occ-control
+ExecStart=/usr/bin/openpower-occ-control
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service
index 8238691..87ac0da 100644
--- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service
+++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service
@@ -8,6 +8,5 @@
Restart=no
Type=oneshot
EnvironmentFile={envfiledir}/obmc/inventory
-ExecStart=/usr/bin/env openpower-read-vpd --vpd $EEPROM --fru $FRUS --object $PATHS
-SyslogIdentifier=openpower-read-vpd
+ExecStart=/usr/bin/openpower-read-vpd --vpd $EEPROM --fru $FRUS --object $PATHS
RemainAfterExit=yes