diff options
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor')
87 files changed, 175 insertions, 91 deletions
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 e343bdfb8..e981dc06d 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 @@ Description=Phosphor Chassis Controller [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 2eb36d66d..443ecbbab 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 @@ After=mapper-wait@-org-openbmc-managers-System.service [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 5b060e470..e535e650c 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 @@ After=mapper-wait@-org-openbmc-managers-System.service [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 1620fe14f..f57e9d849 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 @@ Description=Phosphor Chassis%i Control [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 33b1166c0..ba3af0557 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 @@ After=obmc-read-eeprom@%i.service 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 0f835a618..4a9232b84 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 @@ Description=Phosphor Inventory Manager [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 befc89296..dc3174db3 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 @@ ConditionPathExists=!/run/openbmc/chassis@%i-on [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 0833afb47..1321c215e 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 @@ Conflicts=obmc-chassis-poweron@%i.target [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 9696b1afa..11373618b 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 @@ Conflicts=obmc-chassis-poweron@%i.target [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 cd4f513a0..1e65d0887 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 @@ ConditionPathExists=!/run/openbmc/chassis@%i-on [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 4b981830c..95ef0b88d 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 @@ After=mapper-wait@-org-openbmc-managers-System.service [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 6cc65f892..91adb769b 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 @@ Conflicts=obmc-host-stop@%i.target [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 f8fa7cc7c..82ffe7919 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 @@ Wants=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service [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 e28b06933..26e452c3c 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 @@ BindsTo=dev-%i.device 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 b29460885..a6c90cefe 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 @@ After=mapper-wait@-org-openbmc-control-power0.service [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 a98503059..9440f0c2d 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 @@ After=obmc-mapper.target [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 2ef074077..cbefdeab1 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 @@ Wants=mapper-wait@-xyz-openbmc_project-inventory.service [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 75dd9ab16..8781073d8 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 @@ After=obmc-mapper.target 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 d91909156..14a657ab2 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 @@ After=obmc-mapper.target 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 ccaaa989f..820a42b07 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 @@ Before=obmc-mapper.target [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 b6e75f179..0e8ef3b5d 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 84f8232c3..131c8cdaf 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 @@ Description=Phosphor Dump Manager [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 81f73fe5f..958474989 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 @@ Description=Phosphor Fan Controller [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 ad0db5cd3..c426c445d 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 @@ After=obmc-fan-control.target [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 0c10b09d1..ec6391d5c 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 @@ Before=obmc-fan-control.target [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 96e4ef7ec..d4dc28035 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 @@ Conflicts=obmc-chassis-poweroff@%i.target [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 773e59ecf..2aef8754e 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 @@ Conflicts=obmc-chassis-poweroff@%i.target [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 3751ebd17..2392dcd74 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 @@ Conflicts=obmc-chassis-poweroff@%i.target [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 c91ed4e68..07d23d832 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 @@ Conflicts=obmc-chassis-poweroff@%i.target [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 378391307..3a7f3d53a 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 @@ Description=Phosphor Flash Controller [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 4893cd1cc..d9355b3d2 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 @@ After=mapper-wait@-org-openbmc-control-flash-bios.service [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 fefd172f5..842add34d 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 @@ After=mapper-wait@-org-openbmc-managers-Download.service [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 ddc8ec8ca..9fd20bff3 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 @@ After=mapper-wait@-org-openbmc-control-bmc0.service [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 e7bd28b7c..f3ff75dfe 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 @@ Description=Phosphor Download Manager [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 5c0650b9e..c26273f63 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 @@ Description=Set U-Boot environment variable [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 36b55516b..ff571d7aa 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 @@ Before=xyz.openbmc_project.Software.BMC.Updater.service [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 78975133d..42aa026b9 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 @@ Description=Deletes read-only and kernel ubi volume %I [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 2d7b70335..3e4c15d01 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 @@ Description=Create read-only ubi volumes %I [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 c57040ea7..68c4ab256 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 @@ Description=Deletes BMC read-write ubi volume [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 07820fb27..4a955f2ab 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 @@ Description=Create BMC read-write ubi volume [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 e43b005fd..ff96e8c3e 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 @@ Wants=xyz.openbmc_project.Software.Version.service 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 b0ee4baea..a4934f865 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 0825ebfa0..0141245b2 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 @@ Description=Phosphor Version Software Manager [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 a4b0902d6..a9644a74d 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 @@ Description=Phosphor GPIO %I monitor [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 7872ce69f..758a21f7f 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 @@ ConditionPathExists={envfiledir}/obmc/gpio/phosphor-power-supply-%i.conf [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 5accb4899..26a0343f1 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 @@ ConditionPathExists=!/run/openbmc/host@%i-on 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 c9d1a7c5c..261794133 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 @@ ConditionPathExists=!/run/openbmc/host@%i-on [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 59d0c3d9e..9a64002ec 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 @@ After=mapper-wait@-org-openbmc-managers-System.service [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 2e13cfa51..fd9b539c1 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 @@ After=obmc-webserver-pre.target [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 41eaf8bf2..cfd4b6e59 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 @@ After=obmc-webserver-pre.target [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 fbc8004ce..9afd0c45d 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 @@ Description=Phosphor DBUS Browser [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 02d593c19..5d587093f 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 @@ Description=Lightweight SLP Server 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 707e2504c..c3ae5adcc 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 @@ Before=mapper-wait@-xyz-openbmc_project-inventory.service [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 1253bcc5c..f5abfb5ff 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 @@ Description=Phosphor IPMI BT DBus Bridge [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 ee83c7e40..4bae65d3f 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 @@ After=mapper-wait@-xyz-openbmc_project-inventory.service 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 aec95b8a4..0cccfcd58 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 @@ After=mapper-wait@-org-openbmc-settings-host0.service [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 7aee76f3f..600c86ac2 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 @@ ConditionPathExists=!/run/openbmc/host@0-request [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 bdda6ccec..3d346c561 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 @@ Wants=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service 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 ab836223e..4810a7e86 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 @@ After=mapper-wait@-xyz-openbmc_project-led-groups.service [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 36a443025..38d6c5ac2 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 @@ Conflicts=obmc-led-group-stop@%i.service 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 e7799f34d..93db03efd 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 @@ Conflicts=obmc-led-group-start@%i.service 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 a5ada69f0..2f9a25e91 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 @@ Before=mapper-wait@-xyz-openbmc_project-led-groups.service [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 a475bd0cf..c673cda66 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 @@ Description=Phosphor sysfs LED controller [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 09ea947d1..946c3bf16 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 6206bb3b1..7fb2a5bc3 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 @@ Conflicts=obmc-chassis-poweroff@%i.target [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 8adf56696..35081d85a 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 @@ After=dev-aspeed\x2dmbox.device [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 626e744d7..5d26559f0 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 304490354..9cf577827 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 @@ Wants=mapper-wait@-org-openbmc-NetworkManager-Interface.service 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 5ca1f82b6..73b46055e 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 01e3b177f..b9f7da728 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 @@ Description=Phosphor Network Manager 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 4fa5a5a75..92f68dbbc 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 @@ Description=Phosphor Sensor Manager [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 1bfda8312..d9de6c081 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 @@ After=mapper-wait@-xyz-openbmc_project-inventory.service [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 a091f1a59..8dca3ad4b 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 @@ After=xyz.openbmc_project.ObjectMapper.service [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 8b4be9c7c..50e21665c 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 d3480164f..b0f4a5d28 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 @@ Wants=obmc-mapper.target 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 4e3439658..a959311ad 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 @@ After=op-reset-chassis-on@%i.service [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 f480cc5b7..6062320b2 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 @@ ConditionPathExists=/run/openbmc/chassis@%i-on [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 e3034e3e7..5224c98fa 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 @@ After=mapper-wait@-org-openbmc-managers-System.service 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 5133fad04..9a467eb6c 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 @@ After=mapper-wait@-org-openbmc-managers-System.service 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 9adeed9fb..a70257e18 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 @@ Before=mapper-wait@-xyz-openbmc_project-state-host.service 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 5a8c9a0ef..d4dacf546 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 @@ Description=Phosphor System Manager [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 4d26f961b..9685efecd 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 @@ Description=Phosphor BMC%i Control [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 abca0dc68..b5f6b3f2a 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 @@ After=obmc-mapper.target [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 d83599063..64408b7d4 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 a921fc316..7bfc2d0ca 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 @@ ConditionPathExists=!/run/openbmc/host@%i-on [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 384247451..591d6dcd7 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 8a7e8b64b..942611ef4 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 @@ Description=Phosphor %I watchdog [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 |