Enable BMC patching from the /usr/local path
This commit enables patches from the /usr/local path by replacing
absolute paths to /usr/sbin or /usr/bin in every service file with
"/usr/bin/env ". Additionally, SyslogIdentifier is added to each
file to ensure that journal entries are still distinct.
In two cases, service files also had to change due to references
to ${{PATH}}, which doesn't work with /usr/bin/env. These
references - and the corresponding definitions - were changed to
${{DEVPATH}}.
Resolves openbmc/openbmc#2149
Change-Id: I12c5c6e5101eef6820b985a563313836250ff2c7
Signed-off-by: Michael Tritz <mtritz@us.ibm.com>
diff --git a/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service b/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
index 81f73fe..9584749 100644
--- a/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
+++ b/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
@@ -3,7 +3,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/obmc-phosphor-fand
+ExecStart=/usr/bin/env obmc-phosphor-fand
+SyslogIdentifier=obmc-phosphor-fand
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service b/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
index ad0db5c..c426c44 100644
--- a/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
+++ b/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
@@ -7,4 +7,5 @@
[Service]
Type=oneshot
Restart=no
-ExecStart={sbindir}/mapper call /org/openbmc/control/fans org.openbmc.control.Fans setMax
+ExecStart=/usr/bin/env mapper call /org/openbmc/control/fans org.openbmc.control.Fans setMax
+SyslogIdentifier=mapper
diff --git a/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service b/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
index 0c10b09..ec6391d 100644
--- a/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
+++ b/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
@@ -7,7 +7,8 @@
[Service]
Restart=always
-ExecStart={sbindir}/fan_control.exe -f 6
+ExecStart=/usr/bin/env fan_control.exe -f 6
+SyslogIdentifier=fan_control.exe
Type=dbus
BusName={BUSNAME}
Environment="PYTHONUNBUFFERED=1"
diff --git a/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service b/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
index 96e4ef7..d4dc280 100644
--- a/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
+++ b/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
@@ -6,7 +6,8 @@
[Service]
Restart=on-failure
-ExecStart={sbindir}/phosphor-fan-control --init
+ExecStart=/usr/bin/env phosphor-fan-control --init
+SyslogIdentifier=phosphor-fan-control
[Install]
RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service b/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
index 773e59e..2aef875 100644
--- a/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
+++ b/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service
@@ -4,7 +4,8 @@
[Service]
Restart=on-failure
-ExecStart={sbindir}/phosphor-fan-control --control
+ExecStart=/usr/bin/env phosphor-fan-control --control
+SyslogIdentifier=phosphor-fan-control
[Install]
RequiredBy=obmc-fan-control-ready@%i.target
diff --git a/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service b/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
index 3751ebd..2392dcd 100644
--- a/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
+++ b/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service
@@ -6,7 +6,8 @@
[Service]
Restart=on-failure
-ExecStart={sbindir}/phosphor-fan-monitor
+ExecStart=/usr/bin/env phosphor-fan-monitor
+SyslogIdentifier=phosphor-fan-monitor
Type=notify
NotifyAccess=all
diff --git a/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service b/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
index c91ed4e..07d23d8 100644
--- a/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
+++ b/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service
@@ -6,7 +6,8 @@
[Service]
Restart=on-failure
-ExecStart={sbindir}/phosphor-fan-presence-tach
+ExecStart=/usr/bin/env phosphor-fan-presence-tach
+SyslogIdentifier=phosphor-fan-presence-tach
[Install]
RequiredBy=obmc-chassis-poweron@%i.target