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 <mtritz@us.ibm.com>
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service b/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
index e343bdf..e981dc0 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/obmc-phosphor-chassisd
+ExecStart=/usr/bin/env obmc-phosphor-chassisd
+SyslogIdentifier=obmc-phosphor-chassisd
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
index 2eb36d6..443ecbb 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
@@ -5,7 +5,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/button_power.exe
+ExecStart=/usr/bin/env button_power.exe
+SyslogIdentifier=button_power.exe
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
index 5b060e4..e535e65 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
@@ -5,7 +5,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/button_reset.exe
+ExecStart=/usr/bin/env button_reset.exe
+SyslogIdentifier=button_reset.exe
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
index 1620fe1..f57e9d8 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/chassis_control.py
+ExecStart=/usr/bin/env chassis_control.py
+SyslogIdentifier=chassis_control.py
Type=dbus
BusName={BUSNAME}
Environment="PYTHONUNBUFFERED=1"
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
index 33b1166..ba3af05 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
@@ -7,7 +7,8 @@
Restart=no
Type=oneshot
EnvironmentFile={envfiledir}/obmc/sync_inventory_item/%I
-ExecStart={sbindir}/sync_inventory_items.py -t $FRU_TYPE -n $FRU_NAME -p ${{PROPERTY}} -s $SYNC_TYPE
+ExecStart=/usr/bin/env sync_inventory_items.py -t $FRU_TYPE -n $FRU_NAME -p ${{PROPERTY}} -s $SYNC_TYPE
+SyslogIdentifier=sync_inventory_items.py
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/org.openbmc.Inventory.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/org.openbmc.Inventory.service
index 0f835a6..4a9232b 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/org.openbmc.Inventory.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/org.openbmc.Inventory.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/inventory_items.py
+ExecStart=/usr/bin/env inventory_items.py
+SyslogIdentifier=inventory_items.py
Type=dbus
BusName={BUSNAME}
Environment="PYTHONUNBUFFERED=1"
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
index befc892..dc3174d 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
@@ -12,7 +12,8 @@
[Service]
RemainAfterExit=yes
Type=oneshot
-ExecStart={sbindir}/mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 1
+ExecStart=/usr/bin/env mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 1
+SyslogIdentifier=mapper
[Install]
WantedBy=obmc-host-start@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
index 0833afb..1321c21 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
@@ -10,7 +10,8 @@
[Service]
RemainAfterExit=yes
-ExecStart={sbindir}/mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 0
+ExecStart=/usr/bin/env mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 0
+SyslogIdentifier=mapper
[Install]
WantedBy=obmc-host-stop@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
index 9696b1a..1137361 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
@@ -12,7 +12,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart={sbindir}/pgood_wait /org/openbmc/control/power%i off
+ExecStart=/usr/bin/env pgood_wait /org/openbmc/control/power%i off
+SyslogIdentifier=pgood_wait
ExecStart=/bin/rm -f /run/openbmc/chassis@%i-on
ExecStart=/bin/rm -f /run/openbmc/host@%i-on
ExecStart=/bin/rm -f /run/openbmc/host@%i-request
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
index cd4f513..1e65d08 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
@@ -11,7 +11,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart={sbindir}/pgood_wait /org/openbmc/control/power%i on
+ExecStart=/usr/bin/env pgood_wait /org/openbmc/control/power%i on
+SyslogIdentifier=pgood_wait
TimeoutSec=30
[Install]
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
index 4b98183..95ef0b8 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
@@ -6,7 +6,8 @@
[Service]
EnvironmentFile={envfiledir}/obmc/power_control
Restart=always
-ExecStart={sbindir}/power_control.exe $POLL_INTERVAL $PGOOD_TIMEOUT
+ExecStart=/usr/bin/env power_control.exe $POLL_INTERVAL $PGOOD_TIMEOUT
+SyslogIdentifier=power_control.exe
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
index 6cc65f8..91adb76 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
@@ -7,7 +7,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart={sbindir}/pcie_slot_present.exe
+ExecStart=/usr/bin/env pcie_slot_present.exe
+SyslogIdentifier=pcie_slot_present.exe
[Install]
WantedBy=obmc-host-start@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
index f8fa7cc..82ffe79 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
@@ -5,7 +5,8 @@
[Service]
Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear"
EnvironmentFile={envfiledir}/dropbear
-ExecStart=-{sbindir}/dropbear -i -r ${{DROPBEAR_RSAKEY_DIR}}/dropbear_rsa_host_key -c {bindir}/obmc-console-client $DROPBEAR_EXTRA_ARGS
+ExecStart=-/usr/bin/env dropbear -i -r ${{DROPBEAR_RSAKEY_DIR}}/dropbear_rsa_host_key -c "/usr/bin/env obmc-console-client" $DROPBEAR_EXTRA_ARGS
+SyslogIdentifier=dropbear
ExecReload={base_bindir}/kill -HUP $MAINPID
StandardInput=socket
KillMode=process
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service
index e28b069..26e452c 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service
@@ -4,7 +4,8 @@
After=dev-%i.device
[Service]
-ExecStart={sbindir}/obmc-console-server --config {sysconfdir}/obmc-console.conf %i
+ExecStart=/usr/bin/env obmc-console-server --config {sysconfdir}/obmc-console.conf %i
+SyslogIdentifier=obmc-console-server
Restart=always
[Install]
diff --git a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/org.openbmc.TimeManager.service b/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/org.openbmc.TimeManager.service
index b294608..a6c90ce 100644
--- a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/org.openbmc.TimeManager.service
+++ b/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/org.openbmc.TimeManager.service
@@ -11,7 +11,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/timemanager
+ExecStart=/usr/bin/env timemanager
+SyslogIdentifier=timemanager
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
index a985030..9440f0c 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
+++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service
@@ -4,7 +4,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/phosphor-dbus-monitor
+ExecStart=/usr/bin/env phosphor-dbus-monitor
+SyslogIdentifier=phosphor-dbus-monitor
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
index 2ef0740..cbefdea 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
+++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service
@@ -6,4 +6,5 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart={sbindir}/phosphor-msl-verify
+ExecStart=/usr/bin/env phosphor-msl-verify
+SyslogIdentifier=phosphor-msl-verify
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
index 75dd9ab..8781073 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
+++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service
@@ -7,4 +7,5 @@
Type=oneshot
RemainAfterExit=no
Restart=no
-ExecStart={sbindir}/mapper subtree-remove %I
+ExecStart=/usr/bin/env mapper subtree-remove %I
+SyslogIdentifier=mapper
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
index d919091..14a657a 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
+++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
@@ -7,4 +7,5 @@
Type=oneshot
RemainAfterExit=yes
Restart=no
-ExecStart={sbindir}/mapper wait %I
+ExecStart=/usr/bin/env mapper wait %I
+SyslogIdentifier=mapper
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
index ccaaa98..820a42b 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
+++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
@@ -5,11 +5,12 @@
[Service]
Restart=always
Type=dbus
-ExecStart={sbindir}/phosphor-mapper \
+ExecStart=/usr/bin/env phosphor-mapper \
--path_namespaces="${{MAPPER_NAMESPACES}}" \
--interface_namespaces="${{MAPPER_INTERFACES}}" \
--blacklists="${{MAPPER_BLACKLISTS}}" \
--interface_blacklists="${{MAPPER_INTERFACEBLACKLISTS}}"
+SyslogIdentifier=phosphor-mapper
BusName={BUSNAME}
TimeoutStartSec=300
EnvironmentFile={envfiledir}/obmc/mapper
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
index b6e75f1..0e8ef3b 100644
--- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
+++ b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
@@ -2,7 +2,8 @@
Description=Phosphor Dump core monitor.
[Service]
-ExecStart={sbindir}/phosphor-dump-monitor
+ExecStart=/usr/bin/env phosphor-dump-monitor
+SyslogIdentifier=phosphor-dump-monitor
Restart=always
[Install]
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
index 84f8232..131c8cd 100644
--- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
+++ b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
@@ -3,7 +3,8 @@
[Service]
ExecStartPre=/bin/sh -c 'mkdir -p {BMC_DUMP_PATH}'
-ExecStart={sbindir}/phosphor-dump-manager
+ExecStart=/usr/bin/env phosphor-dump-manager
+SyslogIdentifier=phosphor-dump-manager
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service b/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
index 81f73fe..9584749 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/obmc-phosphor-fand
+ExecStart=/usr/bin/env obmc-phosphor-fand
+SyslogIdentifier=obmc-phosphor-fand
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
index ad0db5c..c426c44 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
@@ -7,4 +7,5 @@
[Service]
Type=oneshot
Restart=no
-ExecStart={sbindir}/mapper call /org/openbmc/control/fans org.openbmc.control.Fans setMax
+ExecStart=/usr/bin/env mapper call /org/openbmc/control/fans org.openbmc.control.Fans setMax
+SyslogIdentifier=mapper
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
index 0c10b09..ec6391d 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
@@ -7,7 +7,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/fan_control.exe -f 6
+ExecStart=/usr/bin/env fan_control.exe -f 6
+SyslogIdentifier=fan_control.exe
Type=dbus
BusName={BUSNAME}
Environment="PYTHONUNBUFFERED=1"
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
index 96e4ef7..d4dc280 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
@@ -6,7 +6,8 @@
[Service]
Restart=on-failure
-ExecStart={sbindir}/phosphor-fan-control --init
+ExecStart=/usr/bin/env phosphor-fan-control --init
+SyslogIdentifier=phosphor-fan-control
[Install]
RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
index 773e59e..2aef875 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
@@ -4,7 +4,8 @@
[Service]
Restart=on-failure
-ExecStart={sbindir}/phosphor-fan-control --control
+ExecStart=/usr/bin/env phosphor-fan-control --control
+SyslogIdentifier=phosphor-fan-control
[Install]
RequiredBy=obmc-fan-control-ready@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
index 3751ebd..2392dcd 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
@@ -6,7 +6,8 @@
[Service]
Restart=on-failure
-ExecStart={sbindir}/phosphor-fan-monitor
+ExecStart=/usr/bin/env phosphor-fan-monitor
+SyslogIdentifier=phosphor-fan-monitor
Type=notify
NotifyAccess=all
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
index c91ed4e..07d23d8 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
@@ -6,7 +6,8 @@
[Service]
Restart=on-failure
-ExecStart={sbindir}/phosphor-fan-presence-tach
+ExecStart=/usr/bin/env phosphor-fan-presence-tach
+SyslogIdentifier=phosphor-fan-presence-tach
[Install]
RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service b/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
index 3783913..3a7f3d5 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/obmc-phosphor-flashd
+ExecStart=/usr/bin/env obmc-phosphor-flashd
+SyslogIdentifier=obmc-phosphor-flashd
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
index 4893cd1..d9355b3 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
@@ -5,7 +5,8 @@
[Service]
Restart=no
-ExecStart={sbindir}/mapper call /org/openbmc/control/flash/bios org.openbmc.Flash init
+ExecStart=/usr/bin/env mapper call /org/openbmc/control/flash/bios org.openbmc.Flash init
+SyslogIdentifier=mapper
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
index fefd172..842add3 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
@@ -5,7 +5,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/flash_bios.exe
+ExecStart=/usr/bin/env flash_bios.exe
+SyslogIdentifier=flash_bios.exe
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
index ddc8ec8..9fd20bf 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
@@ -7,7 +7,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/bmc_update.py
+ExecStart=/usr/bin/env bmc_update.py
+SyslogIdentifier=bmc_update.py
Environment="PYTHONUNBUFFERED=1"
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
index e7bd28b..f3ff75d 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/download_manager.py
+ExecStart=/usr/bin/env download_manager.py
+SyslogIdentifier=download_manager.py
Environment="PYTHONUNBUFFERED=1"
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
index 5c0650b..c26273f 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
@@ -4,4 +4,5 @@
[Service]
Type=oneshot
RemainAfterExit=no
-ExecStart={sbindir}/obmc-flash-bmc ubisetenv %i
+ExecStart=/usr/bin/env obmc-flash-bmc ubisetenv %i
+SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
index 36b5551..ff571d7 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service
@@ -6,7 +6,8 @@
[Service]
Type=oneshot
RemainAfterExit=no
-ExecStart={sbindir}/obmc-flash-bmc ubiremount
+ExecStart=/usr/bin/env obmc-flash-bmc ubiremount
+SyslogIdentifier=obmc-flash-bmc
[Install]
WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
index 7897513..42aa026 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
@@ -4,5 +4,6 @@
[Service]
Type=oneshot
RemainAfterExit=no
-ExecStart={sbindir}/obmc-flash-bmc ubiremove rofs-%i
-ExecStart={sbindir}/obmc-flash-bmc ubiremove kernel-%i
+ExecStart=/usr/bin/env obmc-flash-bmc ubiremove rofs-%i
+ExecStart=/usr/bin/env obmc-flash-bmc ubiremove kernel-%i
+SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
index 2d7b703..3e4c15d 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
@@ -4,5 +4,6 @@
[Service]
Type=oneshot
RemainAfterExit=no
-ExecStart={sbindir}/obmc-flash-bmc ubiro {RO_MTD} rofs-%i %i
-ExecStart={sbindir}/obmc-flash-bmc ubikernel {KERNEL_MTD} kernel-%i %i
+ExecStart=/usr/bin/env obmc-flash-bmc ubiro {RO_MTD} rofs-%i %i
+ExecStart=/usr/bin/env obmc-flash-bmc ubikernel {KERNEL_MTD} kernel-%i %i
+SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
index c57040e..68c4ab2 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
@@ -4,4 +4,5 @@
[Service]
Type=oneshot
RemainAfterExit=no
-ExecStart={sbindir}/obmc-flash-bmc ubiremove rwfs
+ExecStart=/usr/bin/env obmc-flash-bmc ubiremove rwfs
+SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
index 07820fb..4a955f2 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
@@ -4,4 +4,5 @@
[Service]
Type=oneshot
RemainAfterExit=no
-ExecStart={sbindir}/obmc-flash-bmc ubirw {RW_MTD} rwfs
+ExecStart=/usr/bin/env obmc-flash-bmc ubirw {RW_MTD} rwfs
+SyslogIdentifier=obmc-flash-bmc
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
index e43b005..ff96e8c 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service
@@ -4,7 +4,8 @@
Before=xyz.openbmc_project.Software.Version.service
[Service]
-ExecStart={sbindir}/phosphor-image-updater
+ExecStart=/usr/bin/env phosphor-image-updater
+SyslogIdentifier=phosphor-image-updater
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
index b0ee4ba..a4934f8 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
@@ -2,7 +2,8 @@
Description=Phosphor Download Manager
[Service]
-ExecStart={sbindir}/phosphor-download-manager
+ExecStart=/usr/bin/env phosphor-download-manager
+SyslogIdentifier=phosphor-download-manager
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
index 0825ebf..0141245 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service
@@ -3,7 +3,8 @@
[Service]
ExecStartPre=/bin/sh -c 'mkdir -p /tmp/images'
-ExecStart={sbindir}/phosphor-version-software-manager
+ExecStart=/usr/bin/env phosphor-version-software-manager
+SyslogIdentifier=phosphor-version-software-manager
Restart=always
Type=dbus
BusName={BUSNAME}
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 a4b0902..a9644a7 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 @@
[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 7872ce6..758a21f 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 @@
[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}
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service
index 5accb48..26a0343 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service
+++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service
@@ -9,7 +9,8 @@
Type=oneshot
RemainAfterExit=yes
# TODO openbmc/openbmc#1598 - Delete this service once available
-ExecStart={sbindir}/pflash -i
+ExecStart=/usr/bin/env pflash -i
+SyslogIdentifier=pflash
[Install]
WantedBy=obmc-host-start@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
index c9d1a7c..2617941 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
+++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
@@ -14,7 +14,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart={sbindir}/mapper call /org/openbmc/control/host%i org.openbmc.control.Host boot
+ExecStart=/usr/bin/env mapper call /org/openbmc/control/host%i org.openbmc.control.Host boot
+SyslogIdentifier=mapper
[Install]
WantedBy=obmc-host-start@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
index 59d0c3d..9a64002 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
+++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service
@@ -5,7 +5,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/control_host.exe
+ExecStart=/usr/bin/env control_host.exe
+SyslogIdentifier=control_host.exe
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
index 2e13cfa..fd9b539 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
+++ b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service
@@ -6,6 +6,7 @@
[Service]
Restart=always
-ExecStart={sbindir}/phosphor-gevent $APPLICATION
+ExecStart=/usr/bin/env phosphor-gevent $APPLICATION
+SyslogIdentifier=phosphor-gevent
Environment="PYTHONUNBUFFERED=1"
EnvironmentFile={envfiledir}/obmc/wsgi_app
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rocket/phosphor-rocket.service b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rocket/phosphor-rocket.service
index 41eaf8b..cfd4b6e 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rocket/phosphor-rocket.service
+++ b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rocket/phosphor-rocket.service
@@ -5,7 +5,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/phosphor-rocket $APPLICATION
+ExecStart=/usr/bin/env phosphor-rocket $APPLICATION
+SyslogIdentifier=phosphor-rocket
Environment="PYTHONUNBUFFERED=1"
EnvironmentFile={envfiledir}/obmc/wsgi_app
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service b/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service
index fbc8004..9afd0c4 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service
+++ b/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service
@@ -3,5 +3,6 @@
[Service]
Restart=always
-ExecStart={sbindir}/rest-dbus
+ExecStart=/usr/bin/env rest-dbus
+SyslogIdentifier=rest-dbus
Environment="PYTHONUNBUFFERED=1"
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service b/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
index 02d593c..5d58709 100644
--- a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
+++ b/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service
@@ -4,7 +4,8 @@
After=network.target
[Service]
-ExecStart={sbindir}/slpd
+ExecStart=/usr/bin/env slpd
+SyslogIdentifier=slpd
Restart=always
[Install]
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
index 707e250..c3ae5ad 100644
--- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
+++ b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service
@@ -5,7 +5,8 @@
[Service]
Restart=always
Type=dbus
-ExecStart={sbindir}/phosphor-inventory
+ExecStart=/usr/bin/env phosphor-inventory
+SyslogIdentifier=phosphor-inventory
BusName={BUSNAME}
[Install]
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
index 1253bcc..f5abfb5 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/btbridged
+ExecStart=/usr/bin/env btbridged
+SyslogIdentifier=btbridged
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
index ee83c7e..4bae65d 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
@@ -7,7 +7,8 @@
Restart=no
Type=oneshot
EnvironmentFile={envfiledir}/obmc/eeproms/%I
-ExecStart={sbindir}/phosphor-read-eeprom --eeprom $SYSFS_PATH --fruid $FRUID
+ExecStart=/usr/bin/env phosphor-read-eeprom --eeprom $SYSFS_PATH --fruid $FRUID
+SyslogIdentifier=phosphor-read-eeprom
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
index aec95b8..0cccfcd 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
@@ -17,7 +17,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/ipmid
+ExecStart=/usr/bin/env ipmid
+SyslogIdentifier=ipmid
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
index 7aee76f..600c86a 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
@@ -9,5 +9,6 @@
[Service]
Restart=no
-ExecStart={sbindir}/phosphor-softpoweroff
+ExecStart=/usr/bin/env phosphor-softpoweroff
+SyslogIdentifier=phosphor-softpoweroff
Type=oneshot
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
index bdda6cc..3d346c5 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
@@ -11,5 +11,6 @@
After=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service
[Service]
-ExecStart={sbindir}/netipmid
+ExecStart=/usr/bin/env netipmid
+SyslogIdentifier=netipmid
Restart=always
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
index ab83622..4810a7e 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
+++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service
@@ -5,7 +5,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/phosphor-fru-fault-monitor
+ExecStart=/usr/bin/env phosphor-fru-fault-monitor
+SyslogIdentifier=phosphor-fru-fault-monitor
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
index 36a4430..38d6c5a 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
+++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service
@@ -8,4 +8,5 @@
Type=oneshot
RemainAfterExit=yes
Restart=no
-ExecStart={sbindir}/mapper call /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b true
+ExecStart=/usr/bin/env mapper call /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b true
+SyslogIdentifier=mapper
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
index e7799f3..93db03e 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
+++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service
@@ -8,4 +8,5 @@
Type=oneshot
RemainAfterExit=yes
Restart=no
-ExecStart={sbindir}/mapper call /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b false
+ExecStart=/usr/bin/env mapper call /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b false
+SyslogIdentifier=mapper
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
index a5ada69..2f9a25e 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
+++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service
@@ -4,7 +4,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/phosphor-ledmanager
+ExecStart=/usr/bin/env phosphor-ledmanager
+SyslogIdentifier=phosphor-ledmanager
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service
index a475bd0..c673cda 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service
+++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service
@@ -3,4 +3,5 @@
[Service]
Restart=always
-ExecStart={sbindir}/phosphor-ledcontroller -p %f
+ExecStart=/usr/bin/env phosphor-ledcontroller -p %f
+SyslogIdentifier=phosphor-ledcontroller
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
index 09ea947..946c3bf 100644
--- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
+++ b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
@@ -2,7 +2,8 @@
Description=Phosphor Log Manager
[Service]
-ExecStart={sbindir}/phosphor-log-manager
+ExecStart=/usr/bin/env phosphor-log-manager
+SyslogIdentifier=phosphor-log-manager
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
index 6206bb3..7fb2a5b 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
+++ b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
@@ -7,7 +7,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart={sbindir}/mboxctl --reset
+ExecStart=/usr/bin/env mboxctl --reset
+SyslogIdentifier=mboxctl
[Install]
WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service
index 8adf566..35081d8 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service
+++ b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service
@@ -8,7 +8,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/mboxd --flash {FLASH_SIZE} --window-size 1M
+ExecStart=/usr/bin/env mboxd --flash {FLASH_SIZE} --window-size 1M
+SyslogIdentifier=mboxd
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service b/meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service
index 626e744..5d26559 100644
--- a/meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service
+++ b/meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service
@@ -2,7 +2,8 @@
Description=Phosphor Inverse ARP
[Service]
-ExecStart={sbindir}/inarp
+ExecStart=/usr/bin/env inarp
+SyslogIdentifier=inarp
Restart=always
[Install]
diff --git a/meta-phosphor/common/recipes-phosphor/network/network/network-update-dns.service b/meta-phosphor/common/recipes-phosphor/network/network/network-update-dns.service
index 3044903..9cf5778 100644
--- a/meta-phosphor/common/recipes-phosphor/network/network/network-update-dns.service
+++ b/meta-phosphor/common/recipes-phosphor/network/network/network-update-dns.service
@@ -4,7 +4,8 @@
After=mapper-wait@-org-openbmc-NetworkManager-Interface.service
[Service]
-ExecStart={sbindir}/netman_watch_dns /run/systemd/netif/state
+ExecStart=/usr/bin/env netman_watch_dns /run/systemd/netif/state
+SyslogIdentifier=netman_watch_dns
Restart=always
[Install]
diff --git a/meta-phosphor/common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service b/meta-phosphor/common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service
index 5ca1f82..73b4605 100644
--- a/meta-phosphor/common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service
+++ b/meta-phosphor/common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service
@@ -2,7 +2,8 @@
Description=Phosphor Network Manager
[Service]
-ExecStart={sbindir}/netman.py
+ExecStart=/usr/bin/env netman.py
+SyslogIdentifier=netman.py
Environment="PYTHONUNBUFFERED=1"
Restart=always
Type=dbus
diff --git a/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service b/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
index 01e3b17..b9f7da7 100644
--- a/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
+++ b/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
@@ -3,11 +3,11 @@
After=obmc-mapper.target
[Service]
-ExecStart={sbindir}/phosphor-network-manager
+ExecStart=/usr/bin/env phosphor-network-manager
+SyslogIdentifier=phosphor-network-manager
Restart=always
Type=dbus
BusName={BUSNAME}
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
-
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service b/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
index 4fa5a5a..92f68db 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
+++ b/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/sensor_manager2.py
+ExecStart=/usr/bin/env sensor_manager2.py
+SyslogIdentifier=sensor_manager2.py
Type=dbus
BusName={BUSNAME}
Environment="PYTHONUNBUFFERED=1"
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service
index 1bfda83..d9de6c0 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service
+++ b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service
@@ -6,5 +6,6 @@
[Service]
Type=oneshot
-ExecStart={bindir}/max31785-msl -p "${{PATHS}}" -b ${{BUS}} -r ${{REVISION}}
+ExecStart=/usr/bin/env max31785-msl -p "${{PATHS}}" -b ${{BUS}} -r ${{REVISION}}
EnvironmentFile={envfiledir}/obmc/hwmon-max31785/%I.conf
+SyslogIdentifier=max31785-msl
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
index a091f1a..8dca3ad 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
+++ b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
@@ -6,5 +6,6 @@
[Service]
Restart=always
-ExecStart={sbindir}/phosphor-hwmon-readd -o %f
+ExecStart=/usr/bin/env phosphor-hwmon-readd -o %f
+SyslogIdentifier=phosphor-hwmon-readd
EnvironmentFile=/etc/default/obmc/hwmon/%I.conf
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
index 8b4be9c..50e2166 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
+++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service
@@ -2,7 +2,8 @@
Description=Phosphor Settings Daemon
[Service]
-ExecStart={sbindir}/phosphor-settings-manager
+ExecStart=/usr/bin/env phosphor-settings-manager
+SyslogIdentifier=phosphor-settings-manager
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service
index d348016..b0f4a5d 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service
+++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service
@@ -5,7 +5,8 @@
After=obmc-mapper.target
[Service]
-ExecStart={sbindir}/settings_manager.py
+ExecStart=/usr/bin/env settings_manager.py
+SyslogIdentifier=settings_manager.py
Environment="PYTHONUNBUFFERED=1"
Restart=always
Type=dbus
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
index 4e34396..a959311 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
+++ b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
@@ -11,7 +11,8 @@
[Service]
Restart=no
Type=oneshot
-ExecStart={sbindir}/phosphor-discover-system-state --host %i
+ExecStart=/usr/bin/env phosphor-discover-system-state --host %i
+SyslogIdentifier=phosphor-discover-system-state
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
index f480cc5..6062320 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
+++ b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
@@ -12,8 +12,8 @@
[Service]
RemainAfterExit=yes
Type=oneshot
-ExecStart=/usr/sbin/phosphor-host-check
-
+ExecStart=/usr/bin/env phosphor-host-check
+SyslogIdentifier=phosphor-host-check
[Install]
WantedBy=obmc-host-reset@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
index e3034e3..5224c98 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
+++ b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
@@ -5,7 +5,8 @@
Before=mapper-wait@-xyz-openbmc_project-state-bmc.service
[Service]
-ExecStart={sbindir}/phosphor-bmc-state-manager
+ExecStart=/usr/bin/env phosphor-bmc-state-manager
+SyslogIdentifier=phosphor-bmc-state-manager
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
index 5133fad..9a467eb 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
+++ b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
@@ -5,7 +5,8 @@
Before=mapper-wait@-xyz-openbmc_project-state-chassis.service
[Service]
-ExecStart={sbindir}/phosphor-chassis-state-manager
+ExecStart=/usr/bin/env phosphor-chassis-state-manager
+SyslogIdentifier=phosphor-chassis-state-manager
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
index 9adeed9..a70257e 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
+++ b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
@@ -8,7 +8,8 @@
After=phosphor-reset-host-running@0.service
[Service]
-ExecStart={sbindir}/phosphor-host-state-manager
+ExecStart=/usr/bin/env phosphor-host-state-manager
+SyslogIdentifier=phosphor-host-state-manager
Restart=always
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service
index 5a8c9a0..d4dacf5 100644
--- a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service
+++ b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/obmc-phosphor-sysd
+ExecStart=/usr/bin/env obmc-phosphor-sysd
+SyslogIdentifier=obmc-phosphor-sysd
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service b/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
index 4d26f96..9685efe 100644
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/control_bmc.exe
+ExecStart=/usr/bin/env control_bmc.exe
+SyslogIdentifier=control_bmc.exe
Type=dbus
BusName={BUSNAME}
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
index abca0dc..b5f6b3f 100644
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
@@ -5,7 +5,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/system_manager.py
+ExecStart=/usr/bin/env system_manager.py
+SyslogIdentifier=system_manager.py
Type=dbus
BusName={BUSNAME}
Environment="PYTHONUNBUFFERED=1"
diff --git a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service b/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service
index d835990..64408b7 100644
--- a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service
+++ b/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service
@@ -2,7 +2,8 @@
Description=Phosphor User Manager
[Service]
-ExecStart={sbindir}/obmc-phosphor-userd
+ExecStart=/usr/bin/env obmc-phosphor-userd
+SyslogIdentifier=obmc-phosphor-userd
Environment="PYTHONUNBUFFERED=1"
Restart=always
Type=dbus
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
index a921fc3..7bfc2d0 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
+++ b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service
@@ -9,4 +9,5 @@
[Service]
Type=oneshot
-ExecStart={sbindir}/mapper call /xyz/openbmc_project/watchdog/host%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.State.Watchdog Enabled b true
+ExecStart=/usr/bin/env mapper call /xyz/openbmc_project/watchdog/host%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.State.Watchdog Enabled b true
+SyslogIdentifier=mapper
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
index 3842474..591d6dc 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
+++ b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron
@@ -1,3 +1,3 @@
-PATH=/xyz/openbmc_project/watchdog/host0
+DEVPATH=/xyz/openbmc_project/watchdog/host0
SERVICE=xyz.openbmc_project.Watchdog
TARGET=obmc-host-timeout@0.target
diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
index 8a7e8b6..942611e 100644
--- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
+++ b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service
@@ -4,4 +4,5 @@
[Service]
Restart=no
EnvironmentFile={envfiledir}/obmc/watchdog/%I
-ExecStart={sbindir}/phosphor-watchdog --service=${{SERVICE}} --path=${{PATH}} --target=${{TARGET}}
+ExecStart=/usr/bin/env phosphor-watchdog --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}}
+SyslogIdentifier=phosphor-watchdog