summaryrefslogtreecommitdiffstats
path: root/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh
diff options
context:
space:
mode:
authorMatthew Barth <msbarth@us.ibm.com>2018-12-14 15:57:46 -0600
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-01-09 20:14:57 +0000
commite520df4806617df03146fe523fd5c308b5a6ac82 (patch)
tree86c8550413916e2f63b51f9d2c7b804af0b7da37 /meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh
parent33170c397695a768aa9e00bb2928f1cf24a9bab7 (diff)
downloadtalos-openbmc-a0a18dfd83a31ff075daec3c5d78040eaced503c.tar.gz
talos-openbmc-a0a18dfd83a31ff075daec3c5d78040eaced503c.zip
wspoon: Fix max31785 hwmon startup2.6.0.rc12.6.0-rc1
The max31785 hwmon instance fails to start after a systemd patch was removed to handle special characters in the device paths. This uses `systemd-escape` to escape and unescape the device path when the udev rule triggers the max31785 hwmon startup script. Resolves openbmc/openbmc#3443 (From meta-ibm rev: 2790b22411920574b95111a44137be21e07a2e3a) Change-Id: I46d1d1a9de8cb740bfd57cebfd5b2474ff69246c Signed-off-by: Matthew Barth <msbarth@us.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh')
-rwxr-xr-xmeta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh
index 6d4e6ba1e..5eff17450 100755
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh
@@ -3,9 +3,9 @@
# Copy in the correct MAX31785 phosphor-hwmon config file to use based on the
# WaterCooled property, and then start the hwmon service.
-# $1: The OF_FULLNAME udev attribute for the MAX31785
+# $1: The escaped OF_FULLNAME udev attribute for the MAX31785
-base="/etc/default/obmc/hwmon/"$1
+base="/etc/default/obmc/hwmon/"$(systemd-escape -u "$1")
target=$base".conf"
service=$(mapper get-service /xyz/openbmc_project/inventory/system/chassis)
@@ -22,5 +22,5 @@ fi
cp $source $target
-instance=$(systemd-escape $1)
+instance='-'$1
systemctl start xyz.openbmc_project.Hwmon@$instance.service
OpenPOWER on IntegriCloud