diff options
| author | Alexander Filippov <a.filippov@yadro.com> | 2018-11-23 16:04:49 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-11-28 09:45:18 -0500 |
| commit | 2f714db14e994f0bb4cd412e1dd4526c2c517e25 (patch) | |
| tree | c48234da48ad494fbe7dabed3c97a8a4462ba93d /meta-phosphor | |
| parent | 01f149c02c90389f51f2c4eaf5519f9bf2aa57d0 (diff) | |
| download | talos-openbmc-2f714db14e994f0bb4cd412e1dd4526c2c517e25.tar.gz talos-openbmc-2f714db14e994f0bb4cd412e1dd4526c2c517e25.zip | |
Fix the starting of phosphor-hwmon
After the commit 7ead6495b6d6782dd89951e8bfb26131f35863ec
the phosphor-hwmon failed to start with errors like this:
```
/lib/systemd/system/xyz.openbmc_project.Hwmon@.service:8:
Failed to resolve unit specifiers on %f: Invalid argument
```
It happens when the instance name begins with `/` character which causes
this error when used specifier `%f`.
Besides the specifier `%I` looks less buggy and more appropriate in this
case, because it's the only part of path and will be completed inside
the `phosphor-hwmon-readd`.
This commit fixes the starting of the phosphor-hwmon.
Partially resolves: openbmc/openbmc#3435
(From meta-phosphor rev: a87fb2d1eb682ed0f04e0f269966b9ae4aafbb1e)
Change-Id: Ia8185f047f23bdcd9141d7edea47ad50e6f7fe07
Signed-off-by: Alexander Filippov <a.filippov@yadro.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor')
| -rwxr-xr-x | meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh | 3 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh index cde0f96ca..cf72528aa 100755 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh @@ -17,6 +17,7 @@ then fi fi -path="${path//:/--}" +path="${path//-/\\x2d}" +path="${path//:/\\x3a}" systemctl $action 'xyz.openbmc_project.Hwmon@'$path'.service' diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service index 9d3e2635e..b930b5711 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service @@ -5,6 +5,6 @@ After=xyz.openbmc_project.ObjectMapper.service [Service] Restart=on-failure -ExecStart=/usr/bin/env phosphor-hwmon-readd -o %f +ExecStart=/usr/bin/env phosphor-hwmon-readd -o %I SyslogIdentifier=phosphor-hwmon-readd EnvironmentFile=/etc/default/obmc/hwmon/%I.conf |
