From 0ad3b1df9079064491c8318bece22e63cc71b2f4 Mon Sep 17 00:00:00 2001 From: Michael Tritz Date: Tue, 15 Aug 2017 14:07:23 -0500 Subject: Enable BMC patching from the /usr/local path This commit enables patches from the /usr/local path by replacing absolute paths to /usr/sbin or /usr/bin in every service file with "/usr/bin/env ". Additionally, SyslogIdentifier is added to each file to ensure that journal entries are still distinct. In two cases, service files also had to change due to references to ${{PATH}}, which doesn't work with /usr/bin/env. These references - and the corresponding definitions - were changed to ${{DEVPATH}}. Resolves openbmc/openbmc#2149 Change-Id: I12c5c6e5101eef6820b985a563313836250ff2c7 Signed-off-by: Michael Tritz --- .../common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service | 3 ++- .../recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service | 3 ++- .../flash/obmc-flash-bios/org.openbmc.control.Flash.service | 3 ++- .../flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service | 3 ++- .../flash/obmc-mgr-download/org.openbmc.managers.Download.service | 3 ++- .../flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service | 3 ++- .../phosphor-software-manager/obmc-flash-bmc-ubiremount.service | 3 ++- .../phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service | 5 +++-- .../flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service | 5 +++-- .../phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service | 3 ++- .../flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service | 3 ++- .../xyz.openbmc_project.Software.BMC.Updater.service | 3 ++- .../xyz.openbmc_project.Software.Download.service | 3 ++- .../xyz.openbmc_project.Software.Version.service | 3 ++- 14 files changed, 30 insertions(+), 16 deletions(-) (limited to 'meta-phosphor/common/recipes-phosphor/flash') 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} -- cgit v1.2.1