diff options
Diffstat (limited to 'meta-openbmc-machines/meta-openpower')
43 files changed, 86 insertions, 45 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service index f925cdf2e..de0aff1ec 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service @@ -6,6 +6,7 @@ Before=obmc-host-quiesce@%i.target # Adding 5 seconds to allow OCC to collect debug data # before processing checkstop ExecStart={base_bindir}/sleep 5 -ExecStart={sbindir}/checkstop_app +ExecStart=/usr/bin/env checkstop_app +SyslogIdentifier=checkstop_app Type=oneshot Restart=no diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service index 0bb2221a7..6fc3fec82 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service @@ -3,6 +3,7 @@ Description=OpenPOWER debug data collector for host watchdog timeout Before=obmc-host-quiesce@%i.target [Service] -ExecStart={sbindir}/watchdog_timeout +ExecStart=/usr/bin/env watchdog_timeout +SyslogIdentifier=watchdog_timeout Type=oneshot Restart=no diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-squashfsmount@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-squashfsmount@.service index 91095328c..96c1eb624 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-squashfsmount@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-squashfsmount@.service @@ -6,4 +6,5 @@ After=obmc-flash-bios-ubiattach.service [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bios squashfsmount pnor-ro-%i %i +ExecStart=/usr/bin/env obmc-flash-bios squashfsmount pnor-ro-%i %i +SyslogIdentifier=obmc-flash-bios diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiattach.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiattach.service index bae633de2..d0785c9b0 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiattach.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiattach.service @@ -4,4 +4,5 @@ Description=Attach the PNOR mtd device to UBI [Service] Type=oneshot RemainAfterExit=yes -ExecStart={sbindir}/obmc-flash-bios ubiattach +ExecStart=/usr/bin/env obmc-flash-bios ubiattach +SyslogIdentifier=obmc-flash-bios diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service index ee632828c..b4bd2d733 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service @@ -6,5 +6,6 @@ After=obmc-flash-bios-ubiattach.service [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bios ubimount pnor-rw-%i -ExecStart={sbindir}/obmc-flash-bios ubimount pnor-prsv +ExecStart=/usr/bin/env obmc-flash-bios ubimount pnor-rw-%i +ExecStart=/usr/bin/env obmc-flash-bios ubimount pnor-prsv +SyslogIdentifier=obmc-flash-bios diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubipatch.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubipatch.service index c280193df..8afc32712 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubipatch.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubipatch.service @@ -6,4 +6,5 @@ After=usr-local.mount [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bios ubimount pnor-patch +ExecStart=/usr/bin/env obmc-flash-bios ubimount pnor-patch +SyslogIdentifier=obmc-flash-bios diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service index 0b5a0772f..f52cac684 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiremount.service @@ -6,7 +6,8 @@ Before=org.open_power.Software.Host.Updater.service [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bios ubiremount +ExecStart=/usr/bin/env obmc-flash-bios ubiremount +SyslogIdentifier=obmc-flash-bios [Install] WantedBy=multi-user.target diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-prsv.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-prsv.service index 463714c30..1c3939e0e 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-prsv.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-prsv.service @@ -6,4 +6,5 @@ After=obmc-flash-bios-ubiattach.service [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bios ubiumount pnor-prsv +ExecStart=/usr/bin/env obmc-flash-bios ubiumount pnor-prsv +SyslogIdentifier=obmc-flash-bios diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-ro@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-ro@.service index acf1931d2..c6dc553f4 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-ro@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-ro@.service @@ -6,4 +6,5 @@ After=obmc-flash-bios-ubiattach.service [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bios ubiumount pnor-ro-%i +ExecStart=/usr/bin/env obmc-flash-bios ubiumount pnor-ro-%i +SyslogIdentifier=obmc-flash-bios diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-rw@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-rw@.service index 84fd52338..c0ea8e628 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-rw@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiumount-rw@.service @@ -6,4 +6,5 @@ After=obmc-flash-bios-ubiattach.service [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bios ubiumount pnor-rw-%i +ExecStart=/usr/bin/env obmc-flash-bios ubiumount pnor-rw-%i +SyslogIdentifier=obmc-flash-bios diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-updatesymlinks.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-updatesymlinks.service index c0a2bbb66..49e495ee8 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-updatesymlinks.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-updatesymlinks.service @@ -6,7 +6,8 @@ Before=mboxd-reload@.service [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bios updatesymlinks +ExecStart=/usr/bin/env obmc-flash-bios updatesymlinks +SyslogIdentifier=obmc-flash-bios [Install] WantedBy=mboxd.service mboxd-reload@.service diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service index 13bc5b7bc..d7ccaae27 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service @@ -7,7 +7,8 @@ Wants=obmc-flash-bios-ubipatch.service Before=obmc-flash-bios-ubipatch.service [Service] -ExecStart={sbindir}/openpower-update-manager +ExecStart=/usr/bin/env openpower-update-manager +SyslogIdentifier=openpower-update-manager Restart=always Type=dbus BusName={BUSNAME} diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service index 4433fd0fd..221bcebf4 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service @@ -11,7 +11,8 @@ ConditionPathExists=!/run/openbmc/chassis@%i-on ConditionPathExists=/var/lib/obmc/cfam_overrides [Service] -ExecStart={sbindir}/openpower-proc-control CFAMOverride +ExecStart=/usr/bin/env openpower-proc-control CFAMOverride +SyslogIdentifier=openpower-proc-control Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service index af26186c3..77a88e864 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service @@ -10,7 +10,8 @@ Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/host@%i-on [Service] -ExecStart={sbindir}/openpower-proc-control startHost +ExecStart=/usr/bin/env openpower-proc-control startHost +SyslogIdentifier=openpower-proc-control Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service index acad945a5..d7d9f12c4 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/vcs_workaround@.service @@ -10,7 +10,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={sbindir}/openpower-proc-control vcsWorkaround +ExecStart=/usr/bin/env openpower-proc-control vcsWorkaround +SyslogIdentifier=openpower-proc-control Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service index 2da73e3da..022f6e73e 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service @@ -8,7 +8,8 @@ Conflicts=obmc-host-stop@%i.target Restart=no Type=oneshot RemainAfterExit=yes -ExecStart={sbindir}/inventory_upload.py +ExecStart=/usr/bin/env inventory_upload.py +SyslogIdentifier=inventory_upload.py Environment="PYTHONUNBUFFERED=1" [Install] diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service index 3b19c2b30..f89d0f037 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service @@ -3,7 +3,8 @@ Description=OpenPOWER OCC Active Disable Before=obmc-host-stop-pre@%i.target [Service] -ExecStart={bindir}/occ-active.sh disable +ExecStart=/usr/bin/env occ-active.sh disable +SyslogIdentifier=occ-active.sh Type=oneshot [Install] diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service index dbf34d592..a63e18611 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service @@ -4,7 +4,8 @@ Wants=mapper-wait@-xyz-openbmc_project-inventory.service After=mapper-wait@-xyz-openbmc_project-inventory.service [Service] -ExecStart={sbindir}/openpower-occ-control +ExecStart=/usr/bin/env openpower-occ-control +SyslogIdentifier=openpower-occ-control Restart=always Type=dbus BusName={BUSNAME} diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service index 32d6a826e..6eadebf8d 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd/op-vpd-parser.service @@ -8,4 +8,5 @@ After=mapper-wait@-xyz-openbmc_project-inventory.service Restart=no Type=oneshot EnvironmentFile={envfiledir}/obmc/inventory -ExecStart={sbindir}/openpower-read-vpd --vpd $EEPROM --fru $FRUS --object $PATHS +ExecStart=/usr/bin/env openpower-read-vpd --vpd $EEPROM --fru $FRUS --object $PATHS +SyslogIdentifier=openpower-read-vpd diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index ca9256206..424aa2394 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service @@ -7,7 +7,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/avsbus-disable.sh +ExecStart=/usr/bin/env avsbus-disable.sh +SyslogIdentifier=avsbus-disable.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index 60297d944..b7fb41e24 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -6,7 +6,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/avsbus-enable.sh +ExecStart=/usr/bin/env avsbus-enable.sh +SyslogIdentifier=avsbus-enable.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service index 5c2813afc..156ef03c7 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service @@ -7,7 +7,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/avsbus-workaround.sh +ExecStart=/usr/bin/env avsbus-workaround.sh +SyslogIdentifier=avsbus-workaround.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service index e312a96a9..c59461ecb 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service @@ -5,7 +5,8 @@ After=op-wait-power-off@%i.service Conflicts=obmc-chassis-poweron@%i.target [Service] -ExecStart={bindir}/cpld_reset.sh +ExecStart=/usr/bin/env cpld_reset.sh +SyslogIdentifier=cpld_reset.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service index 57c5a8ffd..b240b3e8a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service @@ -7,7 +7,8 @@ Before=obmc-host-start-pre@%i.target Conflicts=obmc-chassis-poweroff@%i.target [Service] -ExecStart={bindir}/cpld_trigger.sh +ExecStart=/usr/bin/env cpld_trigger.sh +SyslogIdentifier=cpld_trigger.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service index d5bdddb49..5d072ad5f 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service @@ -6,7 +6,8 @@ Before=avsbus-enable@%i.service Conflicts=obmc-chassis-poweroff@%i.target [Service] -ExecStart={bindir}/vrm.sh +ExecStart=/usr/bin/env vrm.sh +SyslogIdentifier=vrm.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index 90e8b03b2..859f42883 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service @@ -7,7 +7,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/avsbus-disable.sh +ExecStart=/usr/bin/env avsbus-disable.sh +SyslogIdentifier=avsbus-disable.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index 92d626e7a..99ff9e496 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -7,7 +7,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/avsbus-enable.sh +ExecStart=/usr/bin/env avsbus-enable.sh +SyslogIdentifier=avsbus-enable.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service index ec3017cdb..5e447555e 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service @@ -7,7 +7,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/power-workarounds.sh +ExecStart=/usr/bin/env power-workarounds.sh +SyslogIdentifier=power-workarounds.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service index 0fddc1fad..edddee1f0 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service @@ -6,7 +6,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/ucd_disable_vcs.sh +ExecStart=/usr/bin/env ucd_disable_vcs.sh +SyslogIdentifier=ucd_disable_vcs.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service index 918a7445d..27f231d43 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service @@ -6,7 +6,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/vcs_off.sh +ExecStart=/usr/bin/env vcs_off.sh +SyslogIdentifier=vcs_off.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service index b09358073..cf318732a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service @@ -5,7 +5,8 @@ After=op-wait-power-off@%i.service Conflicts=obmc-chassis-poweron@%i.target [Service] -ExecStart={bindir}/vcs_off.sh +ExecStart=/usr/bin/env vcs_off.sh +SyslogIdentifier=vcs_off.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service index 797db67cb..24e5f175f 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service @@ -8,7 +8,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/vcs_on.sh +ExecStart=/usr/bin/env vcs_on.sh +SyslogIdentifier=vcs_on.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service index 6a6be0336..731ce55c3 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service @@ -7,7 +7,8 @@ Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/vrm-control.sh vdna=0.9 vdnb=0.9 +ExecStart=/usr/bin/env vrm-control.sh vdna=0.9 vdnb=0.9 +SyslogIdentifier=vrm-control.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service index cbac13f7a..9a4f8df42 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service @@ -6,7 +6,8 @@ ConditionPathExists={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf [Service] EnvironmentFile={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf -ExecStart={sbindir}/phosphor-cooling-type ${{OBJPATH}} ${{AIR}} ${{WATER}} ${{DEVICE}} ${{CODE}} +ExecStart=/usr/bin/env phosphor-cooling-type ${{OBJPATH}} ${{AIR}} ${{WATER}} ${{DEVICE}} ${{CODE}} +SyslogIdentifier=phosphor-cooling-type [Install] RequiredBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service index 9eb9697e0..945561b50 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service @@ -6,4 +6,5 @@ StartLimitIntervalSec=0 [Service] Type=oneshot -ExecStart=/usr/sbin/phosphor-unit-failure-monitor --source %i --target obmc-fan-watchdog-takeover.target --action start +ExecStart=/usr/bin/env phosphor-unit-failure-monitor --source %i --target obmc-fan-watchdog-takeover.target --action start +SyslogIdentifier=phosphor-unit-failure-monitor diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service index 23c1fca49..e0ef0aeeb 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service @@ -8,4 +8,5 @@ Conflicts=obmc-chassis-poweroff@0.target Type=oneshot RemainAfterExit=yes EnvironmentFile={envfiledir}/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf -ExecStart={sbindir}/phosphor-gpio-util -p ${{GPIO_PATH}} -g ${{GPIO}} -a ${{ACTION}} -d ${{DELAY}} +ExecStart=/usr/bin/env phosphor-gpio-util -p ${{GPIO_PATH}} -g ${{GPIO}} -a ${{ACTION}} -d ${{DELAY}} +SyslogIdentifier=phosphor-gpio-util diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf index 124864192..b5d14d44f 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf @@ -1,4 +1,4 @@ INVENTORY=/system/chassis/power_supply0 -PATH=/dev/input/by-path/platform-gpio-keys-event +DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=127 NAME=power_supply0 diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf index 512905b9b..cac893b51 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf @@ -1,4 +1,4 @@ INVENTORY=/system/chassis/power_supply1 -PATH=/dev/input/by-path/platform-gpio-keys-event +DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=104 NAME=power_supply1 diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index 51eec7f69..39da992f5 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service @@ -6,7 +6,8 @@ Conflicts=obmc-host-start@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/zaius_avsbus.sh disable +ExecStart=/usr/bin/env zaius_avsbus.sh disable +SyslogIdentifier=zaius_avsbus.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index b945529ac..24aadf5ad 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -6,8 +6,9 @@ Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart={bindir}/zaius_avsbus.sh vdn_max -ExecStart={bindir}/zaius_avsbus.sh enable +ExecStart=/usr/bin/env zaius_avsbus.sh vdn_max +ExecStart=/usr/bin/env zaius_avsbus.sh enable +SyslogIdentifier=zaius_avsbus.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service index 5dd0b101b..9444b367f 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service @@ -12,7 +12,8 @@ ConditionPathExists=!/run/openbmc/chassis@%i-on Restart=no Type=oneshot RemainAfterExit=yes -ExecStart={sbindir}/fix_zaius_refclock.sh +ExecStart=/usr/bin/env fix_zaius_refclock.sh +SyslogIdentifier=fix_zaius_refclock.sh [Install] RequiredBy=obmc-chassis-poweron@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service index 1ca6215a9..f809ca4a7 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service @@ -5,7 +5,8 @@ Before=obmc-power-stop-pre@%i.target Conflicts=obmc-host-start@%i.target [Service] -ExecStart={bindir}/zaius_vcs.sh off +ExecStart=/usr/bin/env zaius_vcs.sh off +SyslogIdentifier=zaius_vcs.sh Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service index 74b8df397..17c7cf640 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service @@ -7,7 +7,8 @@ Before=obmc-host-start-pre@%i.target Conflicts=obmc-host-stop@%i.target [Service] -ExecStart={bindir}/zaius_vcs.sh on +ExecStart=/usr/bin/env zaius_vcs.sh on +SyslogIdentifier=zaius_vcs.sh Type=oneshot RemainAfterExit=yes |
