diff options
3 files changed, 5 insertions, 5 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules index e1c3172f4..fd63e0549 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules @@ -1 +1 @@ -SUBSYSTEM=="hwmon", ACTION=="add", ENV{OF_NAME}=="max31785", RUN="/bin/systemctl start max31785-hwmon-helper@%E{OF_FULLNAME}.service" +SUBSYSTEM=="hwmon", ACTION=="add", ENV{OF_NAME}=="max31785", PROGRAM="/bin/systemd-escape -p '%E{OF_FULLNAME}'", RUN="/bin/systemctl start max31785-hwmon-helper@%c.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service index 98b5541f2..c7ed6f113 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service @@ -5,5 +5,5 @@ After=phosphor-cooling-type@0.service [Service] Type=oneshot -ExecStart=/usr/bin/env start_max31785_hwmon.sh %I +ExecStart=/usr/bin/env start_max31785_hwmon.sh %i SyslogIdentifier=max31785-hwmon-helper 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 |